2012-07-15 [wwp] 3.8.1cvs15

	* src/procmime.c
		Fix bug 2697, thanks to Mikhail Efremov (wrong list ptr used).

diff --git a/ChangeLog b/ChangeLog
index 182bf0585e4d569e2511fe60496652bbd4ae142e..c8bb204686ad9a4384187feaf455f413aa47af07 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-15 [wwp]       3.8.1cvs15
+
+       * src/procmime.c
+               Fix bug 2697, thanks to Mikhail Efremov (wrong list ptr used).
+
 2012-07-10 [paul]      3.8.1cvs14
 
        * src/procmime.c

diff --git a/PATCHSETS b/PATCHSETS
index f2ba81dd76447e2b8c30d96eaab690caeb17bbff..9161a292d272c2b68114c93f0a4c0ad11d993be4 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4389,3 +4389,4 @@
 ( cvs diff -u -r 1.1.2.71 -r 1.1.2.72 src/plugins/pgpcore/sgpgme.c;  ) > 3.8.1cvs12.patchset
 ( cvs diff -u -r 1.94.2.234 -r 1.94.2.235 src/messageview.c;  cvs diff -u -r 1.9.2.57 -r 1.9.2.58 src/common/defs.h;  cvs diff -u -r 1.3.2.18 -r 1.3.2.19 src/common/quoted-printable.c;  cvs diff -u -r 1.3.2.10 -r 1.3.2.11 src/common/quoted-printable.h;  ) > 3.8.1cvs13.patchset
 ( cvs diff -u -r 1.49.2.146 -r 1.49.2.147 src/procmime.c;  ) > 3.8.1cvs14.patchset
+( cvs diff -u -r 1.49.2.147 -r 1.49.2.148 src/procmime.c;  ) > 3.8.1cvs15.patchset

diff --git a/configure.ac b/configure.ac
index 299a359806a1cd26210e5d8ad5075f477e8c5d52..a0801d5283fe473c4734de029ac9bc07f78811ca 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=14
+EXTRA_VERSION=15
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/procmime.c b/src/procmime.c
index 1f3e692b8dea486e3024cf4b6feb170c8111df93..ab3535a400bc6bbf52260fc27f0e7fac8ec5bb3d 100644 (file)
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -1705,7 +1705,7 @@ static void parse_parameters(const gchar *parameters, GHashTable *table)
                            (g_slist_find_custom(concatlist, down_attr, g_strcmp0) == NULL))
                                concatlist = g_slist_prepend(concatlist, g_strdup(tmpattr));
 
-                       if (convert && (g_slist_find_custom(convlist, down_attr, g_strcmp0) == NULL))
+                       if (convert && (g_slist_find_custom(convlist, tmpattr, g_strcmp0) == NULL))
                                convlist = g_slist_prepend(convlist, g_strdup(tmpattr));
 
                        g_free(tmpattr);