[Evolution-hackers] imap encoding patch

[Not Zed <notzed ximian com>]

helps if i spell the mailing list correctly.

--- Begin Message ---

• From: MAILER-DAEMON skeptopotamus ximian com (Mail Delivery System)
• To: notzed ximian com
• Subject: Undelivered Mail Returned to Sender
• Date: Sun, 11 Jan 2004 23:42:11 -0500 (EST)

This is the Postfix program at host skeptopotamus.ximian.com.

I'm sorry to have to inform you that the message returned
below could not be delivered to one or more destinations.

For further assistance, please send mail to <postmaster>

If you do so, please include this problem report. You can
delete your own text from the message returned below.

			The Postfix program

<evolution-hackes ximian com>: unknown user: "evolution-hackes"

Reporting-MTA: dns; skeptopotamus.ximian.com
Arrival-Date: Sun, 11 Jan 2004 23:42:11 -0500 (EST)

Final-Recipient: rfc822; evolution-hackes@ximian.com
Action: failed
Status: 5.0.0
Diagnostic-Code: X-Postfix; unknown user: "evolution-hackes"

--- Begin Message ---

• From: Not Zed <notzed ximian com>
• To: evolution-hackes ximian com
• Subject: fix for imap encoding issues
• Date: Mon, 12 Jan 2004 14:55:03 +1030

what i don't get is how it could ever have worked without this patch ...

But ... *shrug* i'm just posting it incase there's something widly wrong
with it.  It fixes the problem in the bug in the changelog though.

? providers/imap/a.diff
? providers/imap/callgraph.ps
? providers/imap/camel-imap-command.c.00.rtl
? providers/imap/camel-imap-folder.c.00.rtl
? providers/imap/camel-imap-message-cache.c.00.rtl
? providers/imap/camel-imap-provider.c.00.rtl
? providers/imap/camel-imap-search.c.00.rtl
? providers/imap/camel-imap-store-summary.c.00.rtl
? providers/imap/camel-imap-store.c.00.rtl
? providers/imap/camel-imap-summary.c.00.rtl
? providers/imap/camel-imap-utils.c.00.rtl
? providers/imap/camel-imap-wrapper.c.00.rtl
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/camel/ChangeLog,v
retrieving revision 1.1955
diff -u -3 -r1.1955 ChangeLog
--- ChangeLog	11 Jan 2004 04:28:50 -0000	1.1955
+++ ChangeLog	12 Jan 2004 04:37:24 -0000
@@ -1,3 +1,13 @@
+2004-01-12  Not Zed  <NotZed Ximian com>
+
+	** See bug 52725.
+
+	* providers/imap/camel-imap-folder.c (get_content): pass in
+	transfer encoding when setting up wrapper part.
+
+	* providers/imap/camel-imap-wrapper.c (camel_imap_wrapper_new):
+	Added an encoding type parameter, set on data wrapper.
+
 2004-01-10  Jeffrey Stedfast  <fejj ximian com>
 
 	* camel-mime-utils.c (rfc2047_encode_word): if e_iconv() returns
Index: providers/imap/camel-imap-folder.c
===================================================================
RCS file: /cvs/gnome/evolution/camel/providers/imap/camel-imap-folder.c,v
retrieving revision 1.310
diff -u -3 -r1.310 camel-imap-folder.c
--- providers/imap/camel-imap-folder.c	9 Jan 2004 06:26:44 -0000	1.310
+++ providers/imap/camel-imap-folder.c	12 Jan 2004 04:37:31 -0000
@@ -1823,7 +1823,10 @@
 		g_free (part_spec);
 		return content;
 	} else {
-		content = camel_imap_wrapper_new (imap_folder, ci->type, uid, *part_spec ? part_spec : "1", part);
+		CamelTransferEncoding enc;
+
+		enc = ci->encoding?camel_transfer_encoding_from_string(ci->encoding):CAMEL_TRANSFER_ENCODING_DEFAULT;
+		content = camel_imap_wrapper_new (imap_folder, ci->type, enc, uid, *part_spec ? part_spec : "1", part);
 		g_free (part_spec);
 		return content;
 	}
Index: providers/imap/camel-imap-wrapper.c
===================================================================
RCS file: /cvs/gnome/evolution/camel/providers/imap/camel-imap-wrapper.c,v
retrieving revision 1.11
diff -u -3 -r1.11 camel-imap-wrapper.c
--- providers/imap/camel-imap-wrapper.c	21 Aug 2003 16:20:14 -0000	1.11
+++ providers/imap/camel-imap-wrapper.c	12 Jan 2004 04:37:32 -0000
@@ -153,7 +153,8 @@
 
 
 CamelDataWrapper *
-camel_imap_wrapper_new (CamelImapFolder *imap_folder, CamelContentType *type,
+camel_imap_wrapper_new (CamelImapFolder *imap_folder,
+			CamelContentType *type, CamelTransferEncoding encoding,
 			const char *uid, const char *part_spec,
 			CamelMimePart *part)
 {
@@ -164,6 +165,7 @@
 
 	camel_data_wrapper_set_mime_type_field (CAMEL_DATA_WRAPPER (imap_wrapper), type);
 	((CamelDataWrapper *)imap_wrapper)->offline = TRUE;
+	((CamelDataWrapper *)imap_wrapper)->encoding = encoding;
 
 	imap_wrapper->folder = imap_folder;
 	camel_object_ref (imap_folder);
Index: providers/imap/camel-imap-wrapper.h
===================================================================
RCS file: /cvs/gnome/evolution/camel/providers/imap/camel-imap-wrapper.h,v
retrieving revision 1.6
diff -u -3 -r1.6 camel-imap-wrapper.h
--- providers/imap/camel-imap-wrapper.h	27 Oct 2001 16:59:30 -0000	1.6
+++ providers/imap/camel-imap-wrapper.h	12 Jan 2004 04:37:32 -0000
@@ -59,6 +59,7 @@
 /* Constructor */
 CamelDataWrapper *camel_imap_wrapper_new (CamelImapFolder *imap_folder,
 					  CamelContentType *type,
+					  CamelTransferEncoding encoding,
 					  const char *uid,
 					  const char *part_spec,
 					  CamelMimePart *part);

--- End Message ---

--- End Message ---