Clean up printing in Evolution (bug #426816)

svn path=/trunk/; revision=33440

1 files changed, 16 insertions, 16 deletions

diff --git a/mail/em-format-html-print.h b/mail/em-format-html-print.h
index 3cc605ba43..a013d57452 100644
--- a/mail/em-format-html-print.h
+++ b/mail/em-format-html-print.h
@@ -8,32 +8,32 @@
 
 #include "mail/em-format-html.h"
 
-struct GtkPrintSettings;
+#define EM_TYPE_FORMAT_HTML_PRINT \
+	(em_format_html_print_get_type ())
+
 typedef struct _EMFormatHTMLPrint EMFormatHTMLPrint;
 typedef struct _EMFormatHTMLPrintClass EMFormatHTMLPrintClass;
 
-struct _CamelFolder;
-
 struct _EMFormatHTMLPrint {
-	EMFormatHTML formathtml;
+	EMFormatHTML parent;
 
-	struct _GtkWidget *window;	/* used to realise the gtkhtml in a toplevel, i dont know why */
-	struct _GtkPrintSettings *settings;
-	struct _EMFormatHTML *source; /* used for print_message */
+	GtkWidget *window;	/* used to realise the gtkhtml in a toplevel, i dont know why */
+	EMFormatHTML *source; /* used for print_message */
 
-	guint preview:1;
+	GtkPrintOperationAction action;
 };
 
 struct _EMFormatHTMLPrintClass {
-	EMFormatHTMLClass formathtml_class;
+	EMFormatHTMLClass parent_class;
 };
 
-GType em_format_html_print_get_type(void);
-
-EMFormatHTMLPrint *em_format_html_print_new(void);
-
-int em_format_html_print_print(EMFormatHTMLPrint *efhp, EMFormatHTML *source, struct GtkPrintSettings *settings, int preview);
-int em_format_html_print_message(EMFormatHTMLPrint *efhp, EMFormatHTML *source, struct GtkPrintSettings *settings, struct _CamelFolder *folder, const char *uid, int preview);
-int em_format_html_print_raw_message(EMFormatHTMLPrint *efhp, struct _GtkPrintSettings *settings, struct _CamelMimeMessage *msg, int preview);
+GType      em_format_html_print_get_type      (void);
+EMFormatHTMLPrint * em_format_html_print_new  (EMFormatHTML *source,
+                                               GtkPrintOperationAction action);
+void       em_format_html_print_message       (EMFormatHTMLPrint *efhp,
+                                               CamelFolder *folder,
+                                               const char *uid);
+void        em_format_html_print_raw_message  (EMFormatHTMLPrint *efhp,
+                                               CamelMimeMessage *msg);
 
 #endif /* ! _EM_FORMAT_HTML_PRINT_H */