2005-09-29 [paul] 1.9.14cvs61

	* src/plugins/pgpinline/pgpinline.c
		fix bug 819, 'crash accessing sign message'
		Patch by Colin

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index 2609094ce9e1470f4172f57683e4e9740640dfbc..c041057b3a539c5f3dc52248fa8a1b568d8d8f9d 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -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
 2005-09-28 [martin]    1.9.14cvs60
 
        * src/plugins/trayicon/libeggtrayicon/eggtrayicon.c

diff --git a/PATCHSETS b/PATCHSETS
index 958215bc10b01a5c47c852364580fb865f4d0508..519df728ce8ef6e39f20f5b3356860f4f7f69f9c 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -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.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

diff --git a/configure.ac b/configure.ac
index 2f6030079decc7f901585c005239d382dba6f54a..259df42ff1a16b5e1e0eae2556dc24aa7f262660 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=14
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=14
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=60
+EXTRA_VERSION=61

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/plugins/pgpinline/pgpinline.c b/src/plugins/pgpinline/pgpinline.c
index 169d39f05c80966b5bd080d9d49a4622dca86ba1..724f58f3c6a25e44eb3399cb8b47fda8151489a4 100644 (file)
--- a/src/plugins/pgpinline/pgpinline.c
+++ b/src/plugins/pgpinline/pgpinline.c
@@ -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"));
        /* 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);
        g_free(textdata);

+
+       if (!tmp)
+               return 0;
+

        textdata = g_strdup(tmp);
        g_free(tmp);
        
        textdata = g_strdup(tmp);
        g_free(tmp);