talons

commit b8e808c7cec1aad8a15cbf9183c4a34bb727d14c
parent 94fe4e29d1ff3c324657af933f6dbd82e858d8e7
Author: Colin Leroy <colin@colino.net>
Date:   Fri,  5 Dec 2008 18:20:22 +0000

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)

Diffstat:
M
ChangeLog
 | 
7
+++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/codeconv.c
 | 
2
+-
M
src/procmime.c
 | 
1
+

5 files changed, 11 insertions(+), 2 deletions(-)
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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);