diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-08-30 13:37:36 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-08-30 13:40:49 +0800 |
| commit | cfb9c32b6657165e4d5e11aa7b47804f679a61f8 (patch) | |
| tree | 1f9c8954df7a357b5dc20a13ac82bf31c1112083 /mail/em-format-html-print.c | |
| parent | fefeb30f58447f2fa7bcbee16dbe68a9333ce89d (diff) | |
| parent | 0f7f4cfe38b3c4cd83efbe9922ae15c5aee00317 (diff) | |
| download | gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar.gz gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar.bz2 gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar.lz gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar.xz gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.tar.zst gsoc2013-evolution-cfb9c32b6657165e4d5e11aa7b47804f679a61f8.zip | |
Merge commit 'origin/kill-bonobo'
Diffstat (limited to 'mail/em-format-html-print.c')
| -rw-r--r-- | mail/em-format-html-print.c | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/mail/em-format-html-print.c b/mail/em-format-html-print.c index 86242b1467..fb9b1a74a5 100644 --- a/mail/em-format-html-print.c +++ b/mail/em-format-html-print.c @@ -38,22 +38,27 @@ static gpointer parent_class = NULL; static void -efhp_finalize (GObject *o) +efhp_finalize (GObject *object) { - EMFormatHTMLPrint *efhp = (EMFormatHTMLPrint *)o; + EMFormatHTMLPrint *efhp = (EMFormatHTMLPrint *)object; gtk_widget_destroy (efhp->window); if (efhp->source != NULL) g_object_unref (efhp->source); - ((GObjectClass *) parent_class)->finalize (o); + /* Chain up to parent's finalize() method. */ + G_OBJECT_CLASS (parent_class)->finalize (object); } static void -efhp_class_init (GObjectClass *class) +efhp_class_init (EMFormatHTMLPrintClass *class) { + GObjectClass *object_class; + parent_class = g_type_class_peek_parent (class); - class->finalize = efhp_finalize; + + object_class = G_OBJECT_CLASS (class); + object_class->finalize = efhp_finalize; } static void @@ -93,7 +98,7 @@ em_format_html_print_get_type (void) }; type = g_type_register_static ( - em_format_html_get_type (), "EMFormatHTMLPrint", + EM_TYPE_FORMAT_HTML, "EMFormatHTMLPrint", &type_info, 0); } @@ -101,7 +106,8 @@ em_format_html_print_get_type (void) } EMFormatHTMLPrint * -em_format_html_print_new (EMFormatHTML *source, GtkPrintOperationAction action) +em_format_html_print_new (EMFormatHTML *source, + GtkPrintOperationAction action) { EMFormatHTMLPrint *efhp; @@ -210,9 +216,7 @@ emfhp_got_message (CamelFolder *folder, const gchar *uid, return; } - if (efhp->source != NULL) - ((EMFormatHTML *)efhp)->load_http = - efhp->source->load_http_now; + em_format_html_load_images (EM_FORMAT_HTML (efhp)); g_signal_connect ( efhp, "complete", G_CALLBACK (emfhp_complete), efhp); @@ -229,9 +233,10 @@ em_format_html_print_message (EMFormatHTMLPrint *efhp, g_object_ref (efhp); /* Wrap flags to display all entries by default.*/ - ((EMFormatHTML *) efhp)->header_wrap_flags |= EM_FORMAT_HTML_HEADER_TO - | EM_FORMAT_HTML_HEADER_CC - | EM_FORMAT_HTML_HEADER_BCC; + EM_FORMAT_HTML (efhp)->header_wrap_flags |= + EM_FORMAT_HTML_HEADER_TO | + EM_FORMAT_HTML_HEADER_CC | + EM_FORMAT_HTML_HEADER_BCC; mail_get_message ( folder, uid, emfhp_got_message, efhp, mail_msg_unordered_push); |