2009-03-17 [colin] 3.7.1cvs20

	* src/common/utils.c
		Fix win32 build (from cvs12)

diff --git a/ChangeLog b/ChangeLog
index 88c856e1f804e8a78f1f423a5f1c682d00a4b098..07c14f5cfa135635ac1c463f00910c2fd4e7d5db 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-17 [colin]     3.7.1cvs20
+
+       * src/common/utils.c
+               Fix win32 build (from cvs12)
+
 2009-03-17 [colin]     3.7.1cvs19
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index d436d614285cecb2053e9a7321c91ba7d189d9a6..2ad6df52f1fdf0210ee593e7afdace84b1a17a76 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3759,3 +3759,4 @@
 ( cvs diff -u -r 1.16.2.36 -r 1.16.2.37 src/prefs_customheader.c;  ) > 3.7.1cvs17.patchset
 ( cvs diff -u -r 1.16.2.66 -r 1.16.2.67 src/msgcache.c;  cvs diff -u -r 1.204.2.188 -r 1.204.2.189 src/prefs_common.c;  cvs diff -u -r 1.103.2.122 -r 1.103.2.123 src/prefs_common.h;  cvs diff -u -r 1.1.2.36 -r 1.1.2.37 src/prefs_other.c;  cvs diff -u -r 1.5.2.16 -r 1.5.2.17 src/common/prefs.c;  ) > 3.7.1cvs18.patchset
 ( cvs diff -u -r 1.382.2.504 -r 1.382.2.505 src/compose.c;  ) > 3.7.1cvs19.patchset
+( cvs diff -u -r 1.36.2.167 -r 1.36.2.168 src/common/utils.c;  ) > 3.7.1cvs20.patchset

diff --git a/configure.ac b/configure.ac
index 973f925a1488d439106355a09c460812e5923a1b..46f42b554c9f3f2b55ff6858ee4a0899f7bf70b1 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=19
+EXTRA_VERSION=20
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/common/utils.c b/src/common/utils.c
index 03b74dc48576bc7ae845917209c2bbb0c2d51839..2fc71bea927a8287f3b0a27a811e0ebe712ec84d 100644 (file)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -3778,6 +3778,7 @@ int subject_get_prefix_length(const gchar *subject)
                                return len+1;
                        else
                                return len;
+               }
        }
        return 0;
 #endif