** See bug 51660.

2004-01-14  Not Zed  <NotZed@Ximian.com>

        ** See bug 51660.

        * em-format-html-quote.c (efhq_multipart_related): setup part_id
        appropriately.

        * em-format-html-display.c (efhd_output_secure): use part_id in
        classid, and add .signed to part_id for subpart.
        (efhd_bonobo_unknown): use part_id in classid.
        (efhd_format_attachment): use part_id in classid's.

        * em-format-html.c (efh_multipart_related)
        (emfh_multipart_related_check): setup part_id for each subpart.
        (efh_output_secure): as above, and use the part_id for the
        classid.
        (em_format_html_add_pobject): use part_id for a generated classid.
        (efh_text_plain): setup pseudo-parts into part_id.

        * em-format.c (emf_format_clone): setup the part_id base, folder +
        uid.
        (emf_finalise): free the part_id gstring.
        (emf_init): allocate the part_id gstring.
        (em_format_add_puri): build the cid from the part_id rather than
        an arbitrary number, so it is more persistent.  Also save the
        part_id in the puri for multipart/related use.
        (emf_multipart_mixed, emf_multipart_alternative)
        (emf_multipart_appledouble, emf_multipart_encrypted)
        (emf_multipart_related, emf_multipart_signed): Set the part_id for
        each subpart.
        (emf_clear_puri_node): free part_id.

2004-01-13  Not Zed  <NotZed@Ximian.com>

        ** See bug 51660.

        * em-format-html-print.c (em_format_html_print_print): dont take
        message, get the message from the source formatter.

        * em-format.c (emf_format_clone): Added folder and uid parameters,
        changed camelmedium to a mimemessage.

        * em-format-html-display.c (efhd_attachment_button): check the
        icon image cache and if the image is there use it.

        * em-icon-stream.c (em_icon_stream_get_image): api to lookup
        finished images in cache.
        (em_icon_stream_new): add a cache key arg.
        (emis_sync_close): store the image in the cache once its
        completed.

svn path=/trunk/; revision=24210

1 files changed, 6 insertions, 6 deletions

diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c
index ab35e7a090..cc41f8f501 100644
--- a/mail/em-folder-view.c
+++ b/mail/em-folder-view.c
@@ -386,7 +386,7 @@ static void
 emfv_set_folder_uri(EMFolderView *emfv, const char *uri)
 {
 	if (emfv->preview)
-		em_format_format((EMFormat *)emfv->preview, NULL);
+		em_format_format((EMFormat *)emfv->preview, NULL, NULL, NULL);
 	
 	mail_get_folder(uri, 0, emfv_got_folder, emfv, mail_thread_queued);
 }
@@ -1597,7 +1597,7 @@ int em_folder_view_print(EMFolderView *emfv, int preview)
 	EMFormatHTMLPrint *print;
 	GnomePrintConfig *config = NULL;
 	int res;
-	struct _CamelMedium *msg;
+	struct _CamelMimeMessage *msg;
 
 	/* FIXME: need to load the message first */
 	if (!emfv->preview_active)
@@ -1630,7 +1630,7 @@ int em_folder_view_print(EMFolderView *emfv, int preview)
 
 	print = em_format_html_print_new();
 	em_format_set_session((EMFormat *)print, ((EMFormat *)emfv->preview)->session);
-	res = em_format_html_print_print(print, msg, (EMFormatHTML *)emfv->preview, config, preview);
+	res = em_format_html_print_print(print, (EMFormatHTML *)emfv->preview, config, preview);
 	g_object_unref(print);
 	if (config)
 		g_object_unref(config);
@@ -1701,7 +1701,7 @@ emfv_list_done_message_selected(CamelFolder *folder, const char *uid, CamelMimeM
 {
 	EMFolderView *emfv = data;
 
-	em_format_format((EMFormat *)emfv->preview, (struct _CamelMedium *)msg);
+	em_format_format((EMFormat *)emfv->preview, folder, uid, msg);
 	
 	if (emfv->priv->seen_id)
 		g_source_remove(emfv->priv->seen_id);
@@ -1737,7 +1737,7 @@ emfv_list_message_selected(MessageList *ml, const char *uid, EMFolderView *emfv)
 		} else {
 			g_free(emfv->priv->displayed_uid);
 			emfv->priv->displayed_uid = NULL;
-			em_format_format((EMFormat *)emfv->preview, NULL);
+			em_format_format((EMFormat *)emfv->preview, NULL, NULL, NULL);
 		}
 	}
 
@@ -2047,7 +2047,7 @@ emfv_setting_notify(GConfClient *gconf, guint cnxn_id, GConfEntry *entry, EMFold
 			em_format_default_headers(emf);
 		/* force a redraw */
 		if (emf->message)
-			em_format_format_clone(emf, emf->message, emf);
+			em_format_format_clone(emf, emf->folder, emf->uid, emf->message, emf);
 		break; }
 	}
 }