2007-06-04 [wwp] 2.9.2cvs38

	* src/compose.c
		Same as 2.9.2cvs36 but for forwarding.

diff --git a/ChangeLog b/ChangeLog
index ee5fbf4c46514bbce9fa8b4685ee632e6f3e3b38..b3bcb9417c6f326537db5cc3ac591f738ba30b6e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-04 [wwp]       2.9.2cvs38
+
+       * src/compose.c
+               Same as 2.9.2cvs36 but for forwarding.
+
 2007-06-04 [colin]     2.9.2cvs37
 
        * src/compose.c

diff --git a/PATCHSETS b/PATCHSETS
index 56aefb6dfdc74f38b2be40f3866879d17ff4ce14..550165d9f2013847467ffeb1de34f24d29adf8ff 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2613,3 +2613,4 @@
 ( cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/prefs_compose_writing.c;  cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/prefs_quote.c;  ) > 2.9.2cvs35.patchset
 ( cvs diff -u -r 1.382.2.383 -r 1.382.2.384 src/compose.c;  ) > 2.9.2cvs36.patchset
 ( cvs diff -u -r 1.382.2.384 -r 1.382.2.385 src/compose.c;  ) > 2.9.2cvs37.patchset
+( cvs diff -u -r 1.382.2.385 -r 1.382.2.386 src/compose.c;  ) > 2.9.2cvs38.patchset

diff --git a/configure.ac b/configure.ac
index 967edc92a1a28436bc7d36f74ee8d4a638be85a3..6be1fc62fce23a7cb3dec6741d3e1a0e7186c123 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=37
+EXTRA_VERSION=38
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/compose.c b/src/compose.c
index 8493f011dc15495eac6654c8c4d2c06594bcf4ee..d94cdb24784bf89e099418eca965dfdb9d70e7c9 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -1604,7 +1604,7 @@ Compose *compose_forward(PrefsAccount *account, MsgInfo *msginfo,
                }
 
                /* empty quotemark is not allowed */
-               if (qmark && !*qmark)
+               if (qmark == NULL || *qmark == '\0')
                        qmark = "> ";
 
                compose_quote_fmt(compose, full_msginfo,