talons

commit 17921b8eafdba9cbc3528f7336ceff2bdbf5c737
parent a1b497ec37ec9377c2dcb3e46bd898addb27af63
Author: Colin Leroy <colin@colino.net>
Date:   Wed,  3 Feb 2010 13:11:58 +0000

2010-02-03 [colin]	3.7.5cvs4

	* src/privacy.c
		Fix again decoding of encrypted parts. The
		reverting of the patch was wrong, as the
		double-decoding was fixed in smime itself.
		Thanks to Matthias Drochner again...

Diffstat:
M
ChangeLog
 | 
8
++++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/privacy.c
 | 
2
++

4 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+2010-02-03 [colin]	3.7.5cvs4
+
+	* src/privacy.c
+		Fix again decoding of encrypted parts. The
+		reverting of the patch was wrong, as the
+		double-decoding was fixed in smime itself.
+		Thanks to Matthias Drochner again...
+
 2010-02-02 [colin]	3.7.5cvs3
 
 	* src/plugins/smime/smime.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -3944,3 +3944,4 @@
 ( cvs diff -u -r 1.94.2.207 -r 1.94.2.208 src/messageview.c;  cvs diff -u -r 1.83.2.157 -r 1.83.2.158 src/mimeview.c;  ) > 3.7.5cvs1.patchset
 ( cvs diff -u -r 1.1.2.63 -r 1.1.2.64 src/gtk/authors.h;  ) > 3.7.5cvs2.patchset
 ( cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/plugins/smime/smime.c;  cvs diff -u -r 1.10.2.23 -r 1.10.2.24 src/privacy.c;  ) > 3.7.5cvs3.patchset
+( cvs diff -u -r 1.10.2.24 -r 1.10.2.25 src/privacy.c;  ) > 3.7.5cvs4.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=3
+EXTRA_VERSION=4
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
diff --git a/src/privacy.c b/src/privacy.c
@@ -318,6 +318,8 @@ gint privacy_mimeinfo_decrypt(MimeInfo *mimeinfo)
 	GSList *cur;
 	cm_return_val_if_fail(mimeinfo != NULL, FALSE);
 
+	procmime_decode_content(mimeinfo);
+
 	for(cur = systems; cur != NULL; cur = g_slist_next(cur)) {
 		PrivacySystem *system = (PrivacySystem *) cur->data;