Redo this back to the old way: a single GtkHTML with various things inline

        * mail-format.c: Redo this back to the old way: a single GtkHTML
        with various things inline in it. (Gets rid of flicker, simplifies
        some scrolling, selecting, and printing issues.)
        (handle_text_enriched, handle_text_html): Use <iframe>s for these,
        to protect the rest of the document from their possibily invalid
        HTML.
        (handle_via_bonobo): Use (new-and-improved) <object> tags for
        this, moving most of the work back into mail-display.c

        * mail-display.c (on_object_requested): Move the Bonobo embedding
        code back here again (reorganized a bit).
        (on_url_requested): add x-evolution-data handler, for iframe
        bodies.
        (mail_html_new, mail_html_end): removed
        (mail_display_set_message, mail_display_new): Update for NWO.

svn path=/trunk/; revision=3312

1 files changed, 3 insertions, 1 deletions

diff --git a/mail/mail.h b/mail/mail.h
index 26f0c6eb5a..70dc195443 100644
--- a/mail/mail.h
+++ b/mail/mail.h
@@ -32,7 +32,9 @@ BonoboControl *folder_browser_factory_new_control  (void);
 void mail_config_druid (void);
 
 /* mail-format */
-void mail_format_mime_message (CamelMimeMessage *mime_message, GtkBox *box);
+void mail_format_mime_message (CamelMimeMessage *mime_message,
+				   GtkHTML *html, GtkHTMLStream *stream,
+				   CamelMimeMessage *root_message);
 
 EMsgComposer *mail_generate_reply (CamelMimeMessage *mime_message,
 				   gboolean to_all);