2009-03-14 [colin] 3.7.1cvs12

	* src/common/utils.c
		Win32: fix subject prefix length

diff --git a/ChangeLog b/ChangeLog
index 918b19565178dd58000a5aa334558695791fb440..079dcea2ad216aee7ad0adf5c8c1bcb08e5e1572 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-14 [colin]     3.7.1cvs12
+
+       * src/common/utils.c
+               Win32: fix subject prefix length
+
 2009-03-11 [mones]     3.7.1cvs11
 
        * po/es.po

diff --git a/PATCHSETS b/PATCHSETS
index 86b0e03ceefbac9375100d4cc3ab23411fd098a1..0eb39732b6c2819bba40922397e4540c38e2c1ff 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3751,3 +3751,4 @@
 ( cvs diff -u -r 1.52.2.76 -r 1.52.2.77 src/prefs_folder_item.c;  ) > 3.7.1cvs9.patchset
 ( cvs diff -u -r 1.94.2.202 -r 1.94.2.203 src/messageview.c;  ) > 3.7.1cvs10.patchset
 ( cvs diff -u -r 1.60.2.57 -r 1.60.2.58 po/es.po;  ) > 3.7.1cvs11.patchset
+( cvs diff -u -r 1.36.2.166 -r 1.36.2.167 src/common/utils.c;  ) > 3.7.1cvs12.patchset

diff --git a/configure.ac b/configure.ac
index 810607b406edc5e8f86a71bde0f5883804d6e23d..208957f74148e154f3fa68e26a46c54fd9ddd60a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=11
+EXTRA_VERSION=12
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/common/utils.c b/src/common/utils.c
index 5769a32d123318b383e75550a505b2697b6bfe74..03b74dc48576bc7ae845917209c2bbb0c2d51839 100644 (file)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -3773,8 +3773,11 @@ int subject_get_prefix_length(const gchar *subject)
 
        for (n = 0; n < PREFIXES; n++) {
                int len = strlen(prefixes[n]);
-               if (!strncasecmp(subject, prefixes[n], len))
-                       return len;
+               if (!strncasecmp(subject, prefixes[n], len)) {
+                       if (subject[len] == ' ')
+                               return len+1;
+                       else
+                               return len;
        }
        return 0;
 #endif