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

2005-09-29 [paul] 1.9.14cvs61

Browse source 
* src/plugins/pgpinline/pgpinline.c
		fix bug 819, 'crash accessing sign message'
		Patch by Colin
This commit is contained in:
Paul Mangan 2005-09-29 09:14:46 +00:00
parent 87f072e000
commit 8476235451
4 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog-gtk2.claws
View file

@ -1,3 +1,9 @@
2005-09-29 [paul] 1.9.14cvs61
* src/plugins/pgpinline/pgpinline.c
fix bug 819, 'crash accessing sign message'
Patch by Colin
2005-09-28 [martin] 1.9.14cvs60
* src/plugins/trayicon/libeggtrayicon/eggtrayicon.c

1
PATCHSETS
View file

@ -829,3 +829,4 @@
( cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/plugins/pgpcore/sgpgme.c; ) > 1.9.14cvs58.patchset
( cvs diff -u -r 1.9.2.29 -r 1.9.2.30 src/gtk/gtkaspell.c; ) > 1.9.14cvs59.patchset
( cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/plugins/trayicon/libeggtrayicon/eggtrayicon.c; ) > 1.9.14cvs60.patchset
( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/pgpinline/pgpinline.c; ) > 1.9.14cvs61.patchset

2
configure.ac
View file

@ -11,7 +11,7 @@ MINOR_VERSION=9
MICRO_VERSION=14
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_VERSION=60
EXTRA_VERSION=61
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=

12
src/plugins/pgpinline/pgpinline.c
View file

@ -165,7 +165,19 @@ static gint pgpinline_check_signature(MimeInfo *mimeinfo)
/* gtk2: convert back from utf8 */
tmp = conv_codeset_strdup(textdata, CS_UTF_8,
procmime_mimeinfo_get_parameter(mimeinfo, "charset"));
if (!tmp) {
tmp = conv_codeset_strdup(textdata, CS_UTF_8,
conv_get_locale_charset_str_no_utf8());
}
if (!tmp) {
g_warning("Can't convert charset to anything sane\n");
tmp = conv_codeset_strdup(textdata, CS_UTF_8, CS_US_ASCII);
}
g_free(textdata);
if (!tmp)
return 0;
textdata = g_strdup(tmp);
g_free(tmp);