2011-11-01 [colin] 3.7.10cvs68

	* src/common/utils.c
		Fix wrong debug stuff commited.

diff --git a/ChangeLog b/ChangeLog
index 808516716fa0c7fa0ff83abc9a7338dbd29fc0f0..33325d9b7652eceb2d32a6d1f5849c53e3965a4b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-01 [colin]     3.7.10cvs68
+
+       * src/common/utils.c
+               Fix wrong debug stuff commited.
+
 2011-11-01 [colin]     3.7.10cvs67
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 97e26756822a3a5726e48431126fe3b896932d3d..86d2ca239c19c2114d53643c7de3d6f01b42204c 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4271,3 +4271,4 @@
 ( cvs diff -u -r 1.9.2.52 -r 1.9.2.53 src/common/defs.h;  ) > 3.7.10cvs65.patchset
 ( cvs diff -u -r 1.94.2.221 -r 1.94.2.222 src/messageview.c;  cvs diff -u -r 1.83.2.176 -r 1.83.2.177 src/mimeview.c;  cvs diff -u -r 1.20.2.33 -r 1.20.2.34 src/mimeview.h;  cvs diff -u -r 1.395.2.435 -r 1.395.2.436 src/summaryview.c;  ) > 3.7.10cvs66.patchset
 ( cvs diff -u -r 1.382.2.591 -r 1.382.2.592 src/compose.c;  cvs diff -u -r 1.115.2.243 -r 1.115.2.244 src/main.c;  cvs diff -u -r 1.36.2.193 -r 1.36.2.194 src/common/utils.c;  cvs diff -u -r 1.9.2.73 -r 1.9.2.74 src/gtk/gtkaspell.c;  cvs diff -u -r 1.5.2.18 -r 1.5.2.19 src/gtk/gtkaspell.h;  ) > 3.7.10cvs67.patchset
+( cvs diff -u -r 1.36.2.194 -r 1.36.2.195 src/common/utils.c;  ) > 3.7.10cvs68.patchset

diff --git a/configure.ac b/configure.ac
index 41612dc8b4f528f0707e374a5fe528c2672b8ff8..60d9cefeb5f390bcd71f3db631242431f6181ff4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=10
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=67
+EXTRA_VERSION=68
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/common/utils.c b/src/common/utils.c
index 7f985e4e2fbaa1cd218af0c603844df58fe2381f..d5a5a9483e388c16783f60e4006083dc930c5f48 100644 (file)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -1143,7 +1143,6 @@ gint get_quote_level(const gchar *str, const gchar *quote_chars)
        const gchar *p = str;
        gint quote_level = -1;
 
-       return 1;
        /* speed up line processing by only searching to the last '>' */
        if ((first_pos = line_has_quote_char(str, quote_chars)) != NULL) {
                /* skip a line if it contains a '<' before the initial '>' */