2010-02-02 [colin] 3.7.5cvs3

	* src/plugins/smime/smime.c
	* src/privacy.c
		Revert 3.7.4cvs2 and make a better patch for bug
		2059 and 2076. Patch by Matthias Drochner

diff --git a/ChangeLog b/ChangeLog
index 4fcf367eb2ce2b4ee21acb3e37bb16f9a996a0cd..a31a2d5dba313cf5b5599d08b72aa9c33eddca91 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-02-02 [colin]     3.7.5cvs3
+
+       * src/plugins/smime/smime.c
+       * src/privacy.c
+               Revert 3.7.4cvs2 and make a better patch for bug
+               2059 and 2076. Patch by Matthias Drochner
+
 2010-01-31 [pawel]     3.7.5cvs2
 
        * src/gtk/authors.h

diff --git a/PATCHSETS b/PATCHSETS
index 76671b70b5765f3aa208d8cd974fa357eef3a7c4..a2fce7c7eefa27d4f90a17f48aaf0631d18529f0 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3943,3 +3943,4 @@
 ( cvs diff -u -r 1.60.2.135 -r 1.60.2.136 src/addressbook.c;  ) > 3.7.4cvs10.patchset
 ( 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

diff --git a/configure.ac b/configure.ac
index 906c994f92ee3cf2cde67b7c647d56c4e50fae2b..a11263a95f400cc57792c3eb1a1a0e3d1c359f2d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=2
+EXTRA_VERSION=3
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/plugins/smime/smime.c b/src/plugins/smime/smime.c
index f837a9b56f6df8ed8d56d4b39bd6f8db97dac462..50d051db78aad7a4df66f0ed1f3b0ffae7450c52 100644 (file)
--- a/src/plugins/smime/smime.c
+++ b/src/plugins/smime/smime.c
@@ -420,7 +420,7 @@ static MimeInfo *smime_decrypt(MimeInfo *mimeinfo)
        encinfo = mimeinfo;
 
        cipher = sgpgme_data_from_mimeinfo(encinfo);
-       gpgme_data_set_encoding(cipher, GPGME_DATA_ENCODING_BASE64);
+       
        plain = sgpgme_decrypt_verify(cipher, &sigstat, ctx);
 
        gpgme_data_release(cipher);
@@ -791,6 +791,9 @@ gboolean smime_encrypt(MimeInfo *mimeinfo, const gchar *encrypt_data)
        encmultipart->subtype = g_strdup("x-pkcs7-mime");
        g_hash_table_insert(encmultipart->typeparameters, g_strdup("name"),
                             g_strdup("smime.p7m"));
+       g_hash_table_insert(encmultipart->typeparameters,
+                           g_strdup("smime-type"),
+                           g_strdup("enveloped-data"));
        
        encmultipart->disposition = DISPOSITIONTYPE_ATTACHMENT;
        g_hash_table_insert(encmultipart->dispositionparameters, g_strdup("filename"),
@@ -827,7 +830,6 @@ gboolean smime_encrypt(MimeInfo *mimeinfo, const gchar *encrypt_data)
        gpgme_data_new(&gpgenc);
        cm_gpgme_data_rewind(gpgtext);
        
-       gpgme_data_set_encoding(gpgenc, GPGME_DATA_ENCODING_BASE64);
        gpgme_op_encrypt(ctx, kset, GPGME_ENCRYPT_ALWAYS_TRUST, gpgtext, gpgenc);
 
        gpgme_release(ctx);

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