talons

commit 72cea9e601fd6801ec14a4293cf10cf3ccf7ea98
parent 841eb94ff7728493043af79d3b3571b1d7176db5
Author: Paul Mangan <paul@claws-mail.org>
Date:   Sun,  4 May 2008 15:59:02 +0000

2008-05-04 [paul]	3.4.0cvs23

	* src/compose.c
	* src/prefs_common.c
		fix bug 1587 'can not replay with quote'

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

5 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-04 [paul]	3.4.0cvs23
+
+	* src/compose.c
+	* src/prefs_common.c
+		fix bug 1587 'can not replay with quote'
+
 2008-05-03 [colin]	3.4.0cvs22
 
 	* po/de.po
diff --git a/PATCHSETS b/PATCHSETS
@@ -3318,3 +3318,4 @@
 ( cvs diff -u -r 1.42.2.37 -r 1.42.2.38 po/fr.po;  cvs diff -u -r 1.52.2.63 -r 1.52.2.64 src/prefs_folder_item.c;  ) > 3.4.0cvs20.patchset
 ( cvs diff -u -r 1.43.2.96 -r 1.43.2.97 src/toolbar.c;  ) > 3.4.0cvs21.patchset
 ( 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
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=22
+EXTRA_VERSION=23
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/compose.c b/src/compose.c
@@ -1591,7 +1591,7 @@ static Compose *compose_generic_reply(MsgInfo *msginfo,
 
 		} else {
 			qmark = prefs_common.quotemark;
-			body_fmt = prefs_common.quotefmt;
+			body_fmt = gettext(prefs_common.quotefmt);
 		}
 	}
 
@@ -1746,7 +1746,7 @@ Compose *compose_forward(PrefsAccount *account, MsgInfo *msginfo,
 		g_free(msgfile);
 	} else {
 		const gchar *qmark = NULL;
-		const gchar *body_fmt = prefs_common.fw_quotefmt;
+		const gchar *body_fmt = gettext(prefs_common.fw_quotefmt);
 		MsgInfo *full_msginfo;
 
 		full_msginfo = procmsg_msginfo_get_full_info(msginfo);
@@ -1767,7 +1767,7 @@ Compose *compose_forward(PrefsAccount *account, MsgInfo *msginfo,
 
 		} else {
 			qmark = prefs_common.fw_quotemark;
-			body_fmt = prefs_common.fw_quotefmt;
+			body_fmt = gettext(prefs_common.fw_quotefmt);
 		}
 
 		/* empty quotemark is not allowed */
diff --git a/src/prefs_common.c b/src/prefs_common.c
@@ -226,7 +226,7 @@ static PrefParam param[] = {
 	 NULL, NULL, NULL},
 	{"compose_subject_format", "",
 	 &prefs_common.compose_subject_format, P_STRING, NULL, NULL, NULL},
-	{"compose_body_format", NULL,
+	{"compose_body_format", N_("Hello,\\n"),
 	 &prefs_common.compose_body_format, P_STRING, NULL, NULL, NULL},
 
 	{"linewrap_length", "72", &prefs_common.linewrap_len, P_INT,
@@ -293,12 +293,16 @@ static PrefParam param[] = {
 	/* Quote */
 	{"reply_quote_mark", "> ", &prefs_common.quotemark, P_STRING,
 	 NULL, NULL, NULL},
-	{"reply_quote_format", NULL,
+	{"reply_quote_format", N_("On %d\\n%f wrote:\\n\\n%q"),
 	 &prefs_common.quotefmt, P_STRING, NULL, NULL, NULL},
 
 	{"forward_quote_mark", "> ", &prefs_common.fw_quotemark, P_STRING,
 	 NULL, NULL, NULL},
-	{"forward_quote_format", NULL, &prefs_common.fw_quotefmt, P_STRING,
+	{"forward_quote_format",
+	 N_("\\n\\nBegin forwarded message:\\n\\n"
+ 	 "?d{Date: %d\\n}?f{From: %f\\n}?t{To: %t\\n}?c{Cc: %c\\n}"
+ 	 "?n{Newsgroups: %n\\n}?s{Subject: %s\\n}\\n\\n%M"),
+	 &prefs_common.fw_quotefmt, P_STRING,
 	 NULL, NULL, NULL},
 	{"quote_chars", ">", &prefs_common.quote_chars, P_STRING,
 	 NULL, NULL, NULL},