aboutsummaryrefslogtreecommitdiffstats
path: root/camel
diff options
context:
space:
mode:
Diffstat (limited to 'camel')
-rw-r--r--camel/ChangeLog9
-rw-r--r--camel/camel-pgp-mime.c4
-rw-r--r--camel/providers/imap/camel-imap-folder.c8
3 files changed, 15 insertions, 6 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 971f8b1c4a..7d8610c4bd 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,12 @@
+2001-11-16 Jeffrey Stedfast <fejj@ximian.com>
+
+ Since some mail clients like Outlook are broken, we need to set a
+ name parameter on pgp signed and encrypted parts.
+
+ * camel-pgp-mime.c (camel_pgp_mime_part_encrypt): Set a name
+ parameter.
+ (camel_pgp_mime_part_sign): Same.
+
2001-11-14 Jeffrey Stedfast <fejj@ximian.com>
* providers/imap/camel-imap-command.c
diff --git a/camel/camel-pgp-mime.c b/camel/camel-pgp-mime.c
index bfc35f9f41..cc9ba9981a 100644
--- a/camel/camel-pgp-mime.c
+++ b/camel/camel-pgp-mime.c
@@ -306,7 +306,7 @@ camel_pgp_mime_part_sign (CamelPgpContext *context, CamelMimePart **mime_part, c
signed_part = camel_mime_part_new ();
camel_mime_part_set_content (signed_part, CAMEL_STREAM_MEM (sigstream)->buffer->data,
CAMEL_STREAM_MEM (sigstream)->buffer->len,
- "application/pgp-signature");
+ "application/pgp-signature; name=signature.asc");
camel_object_unref (CAMEL_OBJECT (sigstream));
/* construct the container multipart/signed */
@@ -480,7 +480,7 @@ camel_pgp_mime_part_encrypt (CamelPgpContext *context, CamelMimePart **mime_part
encrypted_part = camel_mime_part_new ();
camel_mime_part_set_content (encrypted_part, CAMEL_STREAM_MEM (ciphertext)->buffer->data,
CAMEL_STREAM_MEM (ciphertext)->buffer->len,
- "application/octet-stream");
+ "application/octet-stream; name=encrypted.asc");
camel_object_unref (CAMEL_OBJECT (ciphertext));
camel_mime_part_set_encoding (encrypted_part, CAMEL_MIME_PART_ENCODING_7BIT);
diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c
index dcd33ad224..25a9cdbb66 100644
--- a/camel/providers/imap/camel-imap-folder.c
+++ b/camel/providers/imap/camel-imap-folder.c
@@ -1204,19 +1204,19 @@ imap_copy_online (CamelFolder *source, GPtrArray *uids,
{
CamelImapStore *store = CAMEL_IMAP_STORE (source->parent_store);
int count;
-
+
/* Sync message flags if needed. */
imap_sync_online (source, ex);
if (camel_exception_is_set (ex))
return;
-
+
count = camel_folder_summary_count (destination->summary);
-
+
/* Now copy the messages */
do_copy (source, uids, destination, ex);
if (camel_exception_is_set (ex))
return;
-
+
/* Make the destination notice its new messages */
if (store->current_folder != destination ||
camel_folder_summary_count (destination->summary) == count)