diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2011-11-21 22:51:03 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2011-11-22 13:12:36 +0800 |
commit | f9ffebc2f7a6fb285e686133dcccf17766c2ba79 (patch) | |
tree | 3f569321ed8d54f2579c151d64600d1e3738590c /mail/em-format-html-print.c | |
parent | 6f3b2df27f1bcd71880879bf8236663b72002086 (diff) | |
download | gsoc2013-evolution-f9ffebc2f7a6fb285e686133dcccf17766c2ba79.tar gsoc2013-evolution-f9ffebc2f7a6fb285e686133dcccf17766c2ba79.tar.gz gsoc2013-evolution-f9ffebc2f7a6fb285e686133dcccf17766c2ba79.tar.bz2 gsoc2013-evolution-f9ffebc2f7a6fb285e686133dcccf17766c2ba79.tar.lz gsoc2013-evolution-f9ffebc2f7a6fb285e686133dcccf17766c2ba79.tar.xz gsoc2013-evolution-f9ffebc2f7a6fb285e686133dcccf17766c2ba79.tar.zst gsoc2013-evolution-f9ffebc2f7a6fb285e686133dcccf17766c2ba79.zip |
Mail widget cleanups.
Diffstat (limited to 'mail/em-format-html-print.c')
-rw-r--r-- | mail/em-format-html-print.c | 40 |
1 files changed, 7 insertions, 33 deletions
diff --git a/mail/em-format-html-print.c b/mail/em-format-html-print.c index dbfe011759..fd47275e30 100644 --- a/mail/em-format-html-print.c +++ b/mail/em-format-html-print.c @@ -35,7 +35,10 @@ #include "em-format-html-print.h" #include <e-util/e-print.h> -static gpointer parent_class = NULL; +G_DEFINE_TYPE ( + EMFormatHTMLPrint, + em_format_html_print, + EM_TYPE_FORMAT_HTML) static void efhp_finalize (GObject *object) @@ -47,7 +50,7 @@ efhp_finalize (GObject *object) g_object_unref (efhp->source); /* Chain up to parent's finalize() method. */ - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (em_format_html_print_parent_class)->finalize (object); } static gboolean @@ -61,13 +64,11 @@ efhp_is_inline (EMFormat *emf, } static void -efhp_class_init (EMFormatHTMLPrintClass *class) +em_format_html_print_class_init (EMFormatHTMLPrintClass *class) { GObjectClass *object_class; EMFormatClass *format_class; - parent_class = g_type_class_peek_parent (class); - object_class = G_OBJECT_CLASS (class); object_class->finalize = efhp_finalize; @@ -76,9 +77,8 @@ efhp_class_init (EMFormatHTMLPrintClass *class) } static void -efhp_init (GObject *o) +em_format_html_print_init (EMFormatHTMLPrint *efhp) { - EMFormatHTMLPrint *efhp = (EMFormatHTMLPrint *) o; EWebView *web_view; web_view = em_format_html_get_web_view (EM_FORMAT_HTML (efhp)); @@ -92,32 +92,6 @@ efhp_init (GObject *o) ((EMFormat *) efhp)->print = TRUE; } -GType -em_format_html_print_get_type (void) -{ - static GType type = 0; - - if (G_UNLIKELY (type == 0)) { - static const GTypeInfo type_info = { - sizeof (EMFormatHTMLPrintClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) efhp_class_init, - (GClassFinalizeFunc) NULL, - NULL, /* class_data */ - sizeof (EMFormatHTMLPrint), - 0, /* n_preallocs */ - (GInstanceInitFunc) efhp_init - }; - - type = g_type_register_static ( - EM_TYPE_FORMAT_HTML, "EMFormatHTMLPrint", - &type_info, 0); - } - - return type; -} - EMFormatHTMLPrint * em_format_html_print_new (EMFormatHTML *source, GtkPrintOperationAction action) |