gfgit/claws-mail
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

2008-07-08 [colin] 3.5.0cvs23

Browse source 
* src/compose.c
		Possibly fix po-headers appearing on empty
		templates
This commit is contained in:
Colin Leroy 2008-07-08 19:29:40 +00:00
parent 50eb6841a1
commit 70ddb42c5c
4 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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

1
PATCHSETS
View file

@ -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

2
configure.ac
View file

@ -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=

17
src/compose.c
View file

@ -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 */