talons

commit 70ddb42c5ccb3eed8761be6344032da994cefb29
parent 50eb6841a10f15002067b0ed0604d56a5c7473fc
Author: Colin Leroy <colin@colino.net>
Date:   Tue,  8 Jul 2008 19:29:40 +0000

2008-07-08 [colin]	3.5.0cvs23

	* src/compose.c
		Possibly fix po-headers appearing on empty
		templates

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

4 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-08 [colin]	3.5.0cvs23
+
+	* src/compose.c
+		Possibly fix po-headers appearing on empty
+		templates
+
 2008-07-08 [colin]	3.5.0cvs22
 
 	* src/folderview.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3434,3 +3434,4 @@
 ( cvs diff -u -r 1.274.2.250 -r 1.274.2.251 src/mainwindow.c;  ) > 3.5.0cvs20.patchset
 ( cvs diff -u -r 1.274.2.251 -r 1.274.2.252 src/mainwindow.c;  ) > 3.5.0cvs21.patchset
 ( cvs diff -u -r 1.207.2.201 -r 1.207.2.202 src/folderview.c;  cvs diff -u -r 1.395.2.372 -r 1.395.2.373 src/summaryview.c;  ) > 3.5.0cvs22.patchset
+( cvs diff -u -r 1.382.2.455 -r 1.382.2.456 src/compose.c;  ) > 3.5.0cvs23.patchset
diff --git a/configure.ac b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=5
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=22
+EXTRA_VERSION=23
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/compose.c b/src/compose.c
@@ -1592,7 +1592,10 @@ static Compose *compose_generic_reply(MsgInfo *msginfo,
 
 		} else {
 			qmark = prefs_common.quotemark;
-			body_fmt = gettext(prefs_common.quotefmt);
+			if (prefs_common.quotefmt && *prefs_common.quotefmt)
+				body_fmt = gettext(prefs_common.quotefmt);
+			else
+				body_fmt = "";
 		}
 	}
 
@@ -1747,9 +1750,14 @@ Compose *compose_forward(PrefsAccount *account, MsgInfo *msginfo,
 		g_free(msgfile);
 	} else {
 		const gchar *qmark = NULL;
-		const gchar *body_fmt = gettext(prefs_common.fw_quotefmt);
+		const gchar *body_fmt = NULL;
 		MsgInfo *full_msginfo;
 
+		if (prefs_common.fw_quotefmt && *prefs_common.fw_quotefmt)
+			body_fmt = gettext(prefs_common.fw_quotefmt);
+		else
+			body_fmt = "";
+	
 		full_msginfo = procmsg_msginfo_get_full_info(msginfo);
 		if (!full_msginfo)
 			full_msginfo = procmsg_msginfo_copy(msginfo);
@@ -1768,7 +1776,10 @@ Compose *compose_forward(PrefsAccount *account, MsgInfo *msginfo,
 
 		} else {
 			qmark = prefs_common.fw_quotemark;
-			body_fmt = gettext(prefs_common.fw_quotefmt);
+			if (prefs_common.fw_quotefmt && *prefs_common.fw_quotefmt)
+				body_fmt = gettext(prefs_common.fw_quotefmt);
+			else
+				body_fmt = "";
 		}
 
 		/* empty quotemark is not allowed */