2010-01-15 [colin] 3.7.4cvs2

	* src/privacy.c
		Decode mimeinfo before decrypting it. Probably
		fixes bug 2059 'gpgme >=1.1.8 not compatible
		with S/MIME encryption' and bug 2076 'having
		worked 2 times properly CLAWS ceased to
		decrypt incoming PGP mails -displays base64
		instead - sucks completely'
		Let's hope complete suckage ends here!

diff --git a/ChangeLog b/ChangeLog
index 2d8514298c077e4c470220d86cf1a8127a8befdd..10165d2113b4befd85dbc830d337dc8cfb0ffb14 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-01-15 [colin]     3.7.4cvs2
+
+       * src/privacy.c
+               Decode mimeinfo before decrypting it. Probably
+               fixes bug 2059 'gpgme >=1.1.8 not compatible 
+               with S/MIME encryption' and bug 2076 'having 
+               worked 2 times properly CLAWS ceased to 
+               decrypt incoming PGP mails -displays base64 
+               instead - sucks completely'
+               Let's hope complete suckage ends here!
+
 2010-01-08 [paul]      3.7.4cvs1
 
        * tools/claws.i18n.status.pl

diff --git a/PATCHSETS b/PATCHSETS
index 45b8a37b0a03abb6a73a738fe146daeb3b87fc59..7d0b2dc6f92fdacf4937ca97a5a0b30ff14bd4dd 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3932,3 +3932,4 @@
 ( cvs diff -u -r 1.36.2.180 -r 1.36.2.181 src/common/utils.c;  ) > 3.7.3cvs56.patchset
 ( cvs diff -u -r 1.1.2.16 -r 1.1.2.17 po/ca.po;  cvs diff -u -r 1.9.2.17 -r 1.9.2.18 po/cs.po;  cvs diff -u -r 1.58.2.45 -r 1.58.2.46 po/de.po;  cvs diff -u -r 1.1.2.23 -r 1.1.2.24 po/fi.po;  cvs diff -u -r 1.5.2.15 -r 1.5.2.16 po/hu.po;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 po/id.po;  cvs diff -u -r 1.16.2.10 -r 1.16.2.11 po/ja.po;  cvs diff -u -r 1.28.2.13 -r 1.28.2.14 po/nl.po;  cvs diff -u -r 1.50.2.37 -r 1.50.2.38 po/pt_BR.po;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 po/pt_PT.po;  cvs diff -u -r 1.17.2.20 -r 1.17.2.21 po/ru.po;  cvs diff -u -r 1.2.2.28 -r 1.2.2.29 po/sk.po;  ) > 3.7.3cvs57.patchset
 ( cvs diff -u -r 1.1.2.22 -r 1.1.2.23 tools/claws.i18n.status.pl;  ) > 3.7.4cvs1.patchset
+( cvs diff -u -r 1.10.2.22 -r 1.10.2.23 src/privacy.c;  ) > 3.7.4cvs2.patchset

diff --git a/configure.ac b/configure.ac
index b0775f623eaa70d4973bdecd547c5822d728b058..bf2fe5c3a9a400163750bcb641b2ab5cdbdb88c5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=4
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=1
+EXTRA_VERSION=2
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/privacy.c b/src/privacy.c
index 977a83509adc3116dda5859a5758b23035d2c145..98db19436881737820d4b40048a8cab3196bb390 100644 (file)
--- 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;