** 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, 5 insertions, 5 deletions

diff --git a/mail/em-format-quote.c b/mail/em-format-quote.c
index 1b26ff255e..b8173376e8 100644
--- a/mail/em-format-quote.c
+++ b/mail/em-format-quote.c
@@ -36,7 +36,7 @@ struct _EMFormatQuotePrivate {
 	int dummy;
 };
 
-static void emfq_format_clone(EMFormat *, CamelMedium *, EMFormat *);
+static void emfq_format_clone(EMFormat *, CamelFolder *, const char *, CamelMimeMessage *, EMFormat *);
 static void emfq_format_error(EMFormat *emf, CamelStream *stream, const char *txt);
 static void emfq_format_message(EMFormat *, CamelStream *, CamelMedium *);
 static void emfq_format_source(EMFormat *, CamelStream *, CamelMimePart *);
@@ -127,14 +127,14 @@ em_format_quote_new(const char *credits, CamelStream *stream, guint32 flags)
 }
 
 static void
-emfq_format_clone(EMFormat *emf, CamelMedium *part, EMFormat *src)
+emfq_format_clone(EMFormat *emf, CamelFolder *folder, const char *uid, CamelMimeMessage *msg, EMFormat *src)
 {
 #define emfq ((EMFormatQuote *)emf)
 
-	((EMFormatClass *)emfq_parent)->format_clone(emf, part, src);
+	((EMFormatClass *)emfq_parent)->format_clone(emf, folder, uid, msg, src);
 
 	camel_stream_reset(emfq->stream);
-	em_format_format_message(emf, emfq->stream, part);
+	em_format_format_message(emf, emfq->stream, (CamelMedium *)msg);
 	camel_stream_flush(emfq->stream);
 
 	g_signal_emit_by_name(emf, "complete");
@@ -151,7 +151,7 @@ static void
 emfq_format_message(EMFormat *emf, CamelStream *stream, CamelMedium *part)
 {
 	EMFormatQuote *emfq =(EMFormatQuote *) emf;
-	
+
 	if (emfq->credits)
 		camel_stream_printf(stream, "%s", emfq->credits);