[evolution-patches] blah, the rest of 61940.

[Not Zed <notzed ximian com>]

well, jeff did approve it, so i'm not all to blame.

--

Michael Zucchi <notzed ximian com> "born to die, live to work, it's all downhill from here" Novell's Evolution and Free Software Developer

Index: composer/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/composer/ChangeLog,v
retrieving revision 1.654
diff -u -3 -r1.654 ChangeLog
--- composer/ChangeLog	27 Jul 2004 16:52:17 -0000	1.654
+++ composer/ChangeLog	28 Jul 2004 15:44:34 -0000
@@ -1,3 +1,7 @@
+2004-07-28  Not Zed  <NotZed Ximian com>
+
+	* e-msg-composer.c: Fixes for api changes in mail/ for 61940.
+
 2004-07-23  Radek Doulik  <rodo ximian com>
 
 	* listener.c: removed unused static variable listener_vepv
Index: composer/e-msg-composer.c
===================================================================
RCS file: /cvs/gnome/evolution/composer/e-msg-composer.c,v
retrieving revision 1.476
diff -u -3 -r1.476 e-msg-composer.c
--- composer/e-msg-composer.c	27 Jul 2004 16:52:17 -0000	1.476
+++ composer/e-msg-composer.c	28 Jul 2004 15:44:37 -0000
@@ -3568,7 +3568,7 @@
 		ssize_t len;
 		char *html;
 
-		html = em_utils_part_to_html (mime_part, &len);
+		html = em_utils_part_to_html (mime_part, &len, NULL);
 		e_msg_composer_set_pending_body (composer, html, len);
 	} else {
 		e_msg_composer_attach (composer, mime_part);
@@ -3626,7 +3626,7 @@
 		ssize_t len;
 		char *html;
 
-		html = em_utils_part_to_html (mime_part, &len);
+		html = em_utils_part_to_html (mime_part, &len, NULL);
 		e_msg_composer_set_pending_body (composer, html, len);
 	} else {
 		e_msg_composer_attach (composer, mime_part);
@@ -3686,7 +3686,7 @@
 		ssize_t len;
 		char *html;
 
-		html = em_utils_part_to_html(text_part, &len);
+		html = em_utils_part_to_html(text_part, &len, NULL);
 		e_msg_composer_set_pending_body(composer, html, len);
 	}
 }
@@ -3729,7 +3729,7 @@
 			char *html;
 
 			/* Since the first part is not multipart/alternative, then this must be the body */
-			html = em_utils_part_to_html(mime_part, &len);
+			html = em_utils_part_to_html(mime_part, &len, NULL);
 			e_msg_composer_set_pending_body(composer, html, len);
 		} else if (camel_mime_part_get_content_id (mime_part) ||
 			   camel_mime_part_get_content_location (mime_part)) {
@@ -4007,7 +4007,7 @@
 		ssize_t len;
 		char *html;
 
-		html = em_utils_part_to_html((CamelMimePart *)message, &len);
+		html = em_utils_part_to_html((CamelMimePart *)message, &len, NULL);
 		e_msg_composer_set_pending_body(new, html, len);
 	}