From 4f9e5083f173f242579fc14a98ee6ed45401d189 Mon Sep 17 00:00:00 2001 From: Tristan Chabredier Date: Sun, 15 Jul 2012 07:19:19 +0000 Subject: [PATCH] 2012-07-15 [wwp] 3.8.1cvs15 * src/procmime.c Fix bug 2697, thanks to Mikhail Efremov (wrong list ptr used). --- ChangeLog | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/procmime.c | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 182bf0585..c8bb20468 100644 --- 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 f2ba81dd7..9161a292d 100644 --- 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 299a35980..a0801d528 100644 --- 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 1f3e692b8..ab3535a40 100644 --- 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); -- 2.25.1