talons

commit a3192bc71dd6feb3605060a89cad4d7153889e71
parent 2fd9c08068b2500ca860d0c6dd267cafc283970b
Author: Colin Leroy <colin@colino.net>
Date:   Mon,  5 May 2008 15:42:54 +0000

2008-05-05 [colin]	3.4.0cvs25

	* src/messageview.c
		Fix bug 1602, 'Crash when sending return receipt for
		messages with no subject'

Diffstat:
M
ChangeLog
 | 
6
++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/messageview.c
 | 
2
+-

4 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-05 [colin]	3.4.0cvs25
+
+	* src/messageview.c
+		Fix bug 1602, 'Crash when sending return receipt for
+		messages with no subject'
+
 2008-05-05 [colin]	3.4.0cvs24
 
 	* src/mimeview.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3320,3 +3320,4 @@
 ( cvs diff -u -r 1.58.2.38 -r 1.58.2.39 po/de.po;  ) > 3.4.0cvs22.patchset
 ( cvs diff -u -r 1.382.2.446 -r 1.382.2.447 src/compose.c;  cvs diff -u -r 1.204.2.167 -r 1.204.2.168 src/prefs_common.c;  ) > 3.4.0cvs23.patchset
 ( cvs diff -u -r 1.83.2.128 -r 1.83.2.129 src/mimeview.c;  ) > 3.4.0cvs24.patchset
+( cvs diff -u -r 1.94.2.175 -r 1.94.2.176 src/messageview.c;  ) > 3.4.0cvs25.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=4
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=24
+EXTRA_VERSION=25
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/messageview.c b/src/messageview.c
@@ -867,7 +867,7 @@ static gint disposition_notification_send(MsgInfo *msginfo)
 		orig_to = g_strdup(msginfo->to);
 		extract_address(orig_to);
 	}
-	if (msginfo->subject) {
+	if (msginfo->subject && *(msginfo->subject)) {
 		enc_sub = g_malloc0(strlen(msginfo->subject)*8);
 		qp_encode_line(enc_sub, (const guchar *)msginfo->subject);
 		g_strstrip(enc_sub);