2008-12-05 [colin] 3.6.1cvs61

	* src/codeconv.c
	* src/procmime.c
		Fix bug 1788, 'CM crashes re-encoding
		encoded parameters' (introduced in cvs40)

diff --git a/ChangeLog b/ChangeLog
index cf846310e0b3d6637c0e2a6e8bfce386b8453c47..4c879b8f88359995eb21ddec0303005bd0f64e13 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-12-05 [colin]     3.6.1cvs61
+
+       * src/codeconv.c
+       * src/procmime.c
+               Fix bug 1788, 'CM crashes re-encoding 
+               encoded parameters' (introduced in cvs40)
+
 2008-12-05 [paul]      3.6.1cvs60
 
        * src/prefs_common.h

diff --git a/PATCHSETS b/PATCHSETS
index 1d508aee1bbf98f91493fc2ca934e1a2e6b1e4a1..460515713058276cb5345056560b3138d40b50f8 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3642,3 +3642,4 @@
 ( cvs diff -u -r 1.654.2.3704 -r 1.654.2.3705 configure.ac;  ) > 3.6.1cvs58.patchset
 ( cvs diff -u -r 1.16.2.62 -r 1.16.2.63 src/msgcache.c;  cvs diff -u -r 1.395.2.401 -r 1.395.2.402 src/summaryview.c;  cvs diff -u -r 1.1.4.51 -r 1.1.4.52 src/gtk/gtksctree.c;  ) > 3.6.1cvs59.patchset
 ( cvs diff -u -r 1.103.2.118 -r 1.103.2.119 src/prefs_common.h;  ) > 3.6.1cvs60.patchset
+( cvs diff -u -r 1.65.2.63 -r 1.65.2.64 src/codeconv.c;  cvs diff -u -r 1.49.2.122 -r 1.49.2.123 src/procmime.c;  ) > 3.6.1cvs61.patchset

diff --git a/configure.ac b/configure.ac
index b1bbe5f0c43e953cb8f21920f54f76ca15de6191..76c2864866df10a5e0c4281d17a28dcff1d68132 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=60
+EXTRA_VERSION=61
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/codeconv.c b/src/codeconv.c
index 920f34c21d394d86bdc3a6513d36aeda8cdbfb3e..0bb8c327fdd0311bc4a3bcb407b617582b20a711 100644 (file)
--- a/src/codeconv.c
+++ b/src/codeconv.c
@@ -1710,7 +1710,7 @@ gchar *conv_filename_from_utf8(const gchar *utf8_file)
 
        fs_file = g_filename_from_utf8(utf8_file, -1, NULL, NULL, &error);
        if (error) {
-               g_warning("failed to convert encoding of file name: %s\n",
+               debug_print("failed to convert encoding of file name: %s\n",
                          error->message);
                g_error_free(error);
        }

diff --git a/src/procmime.c b/src/procmime.c
index 951fdd8ea134ad8630fb0c03b36c39fc81cc94db..8cd5a74f49eb09bde39d06429581ff605d5bd8bc 100644 (file)
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -1707,6 +1707,7 @@ static void parse_parameters(const gchar *parameters, GHashTable *table)
                while ((partvalue = g_hash_table_lookup(table, attrwnum)) != NULL) {
                        g_string_append(value, partvalue);
 
+                       g_hash_table_remove(table, attrwnum);
                        g_free(attrwnum);
                        n++;
                        attrwnum = g_strdup_printf("%s*%d", attribute, n);