Merge commit 'origin/kill-bonobo'

1 files changed, 42 insertions, 22 deletions

diff --git a/mail/em-format-html.h b/mail/em-format-html.h
index 81a6811de5..4f9c0b209b 100644
--- a/mail/em-format-html.h
+++ b/mail/em-format-html.h
@@ -22,13 +22,13 @@
  */
 
 /*
-  Concrete class for formatting mails to html
+  Abstract class for formatting mails to html
 */
 
 #ifndef EM_FORMAT_HTML_H
 #define EM_FORMAT_HTML_H
 
-#include <mail/em-format.h>
+#include <em-format/em-format.h>
 #include <mail/mail-config.h>
 #include <camel/camel-medium.h>
 #include <camel/camel-mime-part.h>
@@ -73,6 +73,16 @@ typedef enum {
 	EM_FORMAT_HTML_STATE_RENDERING
 } EMFormatHTMLState;
 
+typedef enum {
+	EM_FORMAT_HTML_COLOR_BODY,	/* header area background */
+	EM_FORMAT_HTML_COLOR_CITATION,	/* citation font color */
+	EM_FORMAT_HTML_COLOR_CONTENT,	/* message area background */
+	EM_FORMAT_HTML_COLOR_FRAME,	/* frame around message area */
+	EM_FORMAT_HTML_COLOR_HEADER,	/* header font color */
+	EM_FORMAT_HTML_COLOR_TEXT,	/* message font color */
+	EM_FORMAT_HTML_NUM_COLOR_TYPES
+} EMFormatHTMLColorType;
+
 /* A HTMLJob will be executed in another thread, in sequence.
    It's job is to write to its stream, close it if successful,
    then exit. */
@@ -196,8 +206,7 @@ struct _EMFormatHTMLPObject {
  * multipart/related objects and inline images.
  **/
 struct _EMFormatHTML {
-	EMFormat format;
-
+	EMFormat parent;
 	EMFormatHTMLPrivate *priv;
 
 	GtkHTML *html;
@@ -207,15 +216,6 @@ struct _EMFormatHTML {
 	GSList *headers;
 
 	guint32 text_html_flags; /* default flags for text to html conversion */
-	guint32 body_colour;	/* header box colour */
-	guint32 header_colour;
-	guint32 text_colour;
-	guint32 frame_colour;
-	guint32 content_colour;
-	guint32 citation_colour;
-	guint load_http:2;
-	guint load_http_now:1;
-	guint mark_citations:1;
 	guint simple_headers:1; /* simple header format, no box/table */
 	guint hide_headers:1; /* no headers at all */
 	guint show_icon:1; /* show an icon when the sender used Evo */
@@ -225,19 +225,40 @@ struct _EMFormatHTML {
 };
 
 struct _EMFormatHTMLClass {
-	EMFormatClass format_class;
+	EMFormatClass parent_class;
+
+	GType html_widget_type;
 };
 
 GType		em_format_html_get_type		(void);
-EMFormatHTML *	em_format_html_new		(void);
-void		em_format_html_load_http	(EMFormatHTML *efh);
-
-void		em_format_html_set_load_http	(EMFormatHTML *efh,
-						 gint style);
+void		em_format_html_load_images	(EMFormatHTML *efh);
+void		em_format_html_get_color	(EMFormatHTML *efh,
+						 EMFormatHTMLColorType type,
+						 GdkColor *color);
+void		em_format_html_set_color	(EMFormatHTML *efh,
+						 EMFormatHTMLColorType type,
+						 const GdkColor *color);
+MailConfigHTTPMode
+		em_format_html_get_image_loading_policy
+						(EMFormatHTML *efh);
+void		em_format_html_set_image_loading_policy
+						(EMFormatHTML *efh,
+						 MailConfigHTTPMode policy);
+gboolean	em_format_html_get_mark_citations
+						(EMFormatHTML *efh);
 void		em_format_html_set_mark_citations
 						(EMFormatHTML *efh,
-						 gint state,
-						 guint32 citation_colour);
+						 gboolean mark_citations);
+gboolean	em_format_html_get_only_local_photos
+						(EMFormatHTML *efh);
+void		em_format_html_set_only_local_photos
+						(EMFormatHTML *efh,
+						 gboolean only_local_photos);
+gboolean	em_format_html_get_show_sender_photo
+						(EMFormatHTML *efh);
+void		em_format_html_set_show_sender_photo
+						(EMFormatHTML *efh,
+						 gboolean show_sender_photo);
 
 /* retrieves a pseudo-part icon wrapper for a file */
 CamelMimePart *	em_format_html_file_part	(EMFormatHTML *efh,
@@ -261,7 +282,6 @@ EMFormatHTMLPObject *
 void		em_format_html_remove_pobject	(EMFormatHTML *efh,
 						 EMFormatHTMLPObject *pobject);
 void		em_format_html_clear_pobject	(EMFormatHTML *efh);
-
 EMFormatHTMLJob *
 		em_format_html_job_new		(EMFormatHTML *efh,
 						 void (*callback)(EMFormatHTMLJob *job, gint cancelled),