Revert "merge patched into master"
authorJoachim Breitner <mail@joachim-breitner.de>
Sat, 17 Apr 2010 17:14:18 +0000 (19:14 +0200)
committerJoachim Breitner <mail@joachim-breitner.de>
Sat, 17 Apr 2010 17:14:18 +0000 (19:14 +0200)
This reverts commit 4189605f9fb9d67eb8cca57ba1c79c479cb45a1b, reversing
changes made to 30a48a25a10343748460eb28d3f27c9b135abcb6.

debian/.git-dpm
debian/patches/0016-OnlineSpellerImpl-process_fo-avoid-segfault.patch [deleted file]
debian/patches/series
serna/plugins/speller/OnlineSpeller.cxx

index b3c2cbc..4cf368d 100644 (file)
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-d35efe6d0fc04c4cd1854a528edf92e48b6b1149
-d35efe6d0fc04c4cd1854a528edf92e48b6b1149
+57a15e99b80885b4281174e25357d7b815943863
+57a15e99b80885b4281174e25357d7b815943863
 0373d04208e9a07a2fa2ddd0a9e3c4b7bc3c2e77
 0373d04208e9a07a2fa2ddd0a9e3c4b7bc3c2e77
 serna-free_0.svn288.orig.tar.gz
diff --git a/debian/patches/0016-OnlineSpellerImpl-process_fo-avoid-segfault.patch b/debian/patches/0016-OnlineSpellerImpl-process_fo-avoid-segfault.patch
deleted file mode 100644 (file)
index 1b54174..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-From d35efe6d0fc04c4cd1854a528edf92e48b6b1149 Mon Sep 17 00:00:00 2001
-From: Joachim Breitner <mail@joachim-breitner.de>
-Date: Sat, 17 Apr 2010 17:28:11 +0200
-Subject: OnlineSpellerImpl::process_fo avoid segfault
-
----
- serna/plugins/speller/OnlineSpeller.cxx |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/serna/plugins/speller/OnlineSpeller.cxx b/serna/plugins/speller/OnlineSpeller.cxx
-index 7eb2d17..d3c4410 100644
---- a/serna/plugins/speller/OnlineSpeller.cxx
-+++ b/serna/plugins/speller/OnlineSpeller.cxx
-@@ -188,6 +188,8 @@ static void update_fo_decoration(Formatter::TextFo* text_fo)
- bool OnlineSpellerImpl::process_fo()
- {
-+    if (textFoModList_.isEmpty())
-+        return false;
-     Formatter::TextFo* text_fo = textFoModList_.pop_front();
-     if (!text_fo) {
-         deregisterHandler(this);
--- 
-1.7.0.4
-
index ab38b23..c0462c3 100644 (file)
@@ -13,4 +13,3 @@
 0013-Use-assistant-qt4-instead-of-assistant-on-Debian.patch
 0014-Do-not-strip.patch
 0015-Do-not-hide-build-output.patch
-0016-OnlineSpellerImpl-process_fo-avoid-segfault.patch
index d3c4410..7eb2d17 100644 (file)
@@ -188,8 +188,6 @@ static void update_fo_decoration(Formatter::TextFo* text_fo)
 
 bool OnlineSpellerImpl::process_fo()
 {
-    if (textFoModList_.isEmpty())
-        return false;
     Formatter::TextFo* text_fo = textFoModList_.pop_front();
     if (!text_fo) {
         deregisterHandler(this);