From 2a7a0769bea533b3935f373210b696d10606750c Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Sat, 14 Mar 2009 08:19:23 +0000 Subject: [PATCH 1/1] 2009-03-14 [colin] 3.7.1cvs12 * src/common/utils.c Win32: fix subject prefix length --- ChangeLog | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/common/utils.c | 7 +++++-- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 918b19565..079dcea2a 100644 --- 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 86b0e03ce..0eb39732b 100644 --- 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 810607b40..208957f74 100644 --- 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 5769a32d1..03b74dc48 100644 --- 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 -- 2.25.1