talons

commit a1b497ec37ec9377c2dcb3e46bd898addb27af63
parent c39cdcb82ac03c17e8cd29b742128c51c83b1875
Author: Colin Leroy <colin@colino.net>
Date:   Tue,  2 Feb 2010 17:01:04 +0000

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

Diffstat:
M
ChangeLog
 | 
7
+++++++
M
PATCHSETS
 | 
1
+
M
configure.ac
 | 
2
+-
M
src/plugins/smime/smime.c
 | 
6
++++--
M
src/privacy.c
 | 
2
--

5 files changed, 13 insertions(+), 5 deletions(-)
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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;