diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2010-08-24 23:21:41 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2010-08-25 02:37:02 +0800 |
commit | ecf3434da05b1f39f793c24b38bfd278e10b5786 (patch) | |
tree | 485ed2399920ecb10dbee2b4db4c437c22574a20 /composer/e-composer-from-header.c | |
parent | f1d2541c487fbf7433a1b9aad8e8982ef08b85f5 (diff) | |
download | gsoc2013-evolution-ecf3434da05b1f39f793c24b38bfd278e10b5786.tar gsoc2013-evolution-ecf3434da05b1f39f793c24b38bfd278e10b5786.tar.gz gsoc2013-evolution-ecf3434da05b1f39f793c24b38bfd278e10b5786.tar.bz2 gsoc2013-evolution-ecf3434da05b1f39f793c24b38bfd278e10b5786.tar.lz gsoc2013-evolution-ecf3434da05b1f39f793c24b38bfd278e10b5786.tar.xz gsoc2013-evolution-ecf3434da05b1f39f793c24b38bfd278e10b5786.tar.zst gsoc2013-evolution-ecf3434da05b1f39f793c24b38bfd278e10b5786.zip |
GObject boilerplate cleanup.
Prefer thread-safe G_DEFINE_TYPE and G_DEFINE_INTERFACE macros over
manual GType registration.
This is just a start... lots more to do.
Diffstat (limited to 'composer/e-composer-from-header.c')
-rw-r--r-- | composer/e-composer-from-header.c | 39 |
1 files changed, 7 insertions, 32 deletions
diff --git a/composer/e-composer-from-header.c b/composer/e-composer-from-header.c index 4dadfa7ac7..856d36a1e8 100644 --- a/composer/e-composer-from-header.c +++ b/composer/e-composer-from-header.c @@ -29,9 +29,13 @@ enum { LAST_SIGNAL }; -static gpointer parent_class; static guint signal_ids[LAST_SIGNAL]; +G_DEFINE_TYPE ( + EComposerFromHeader, + e_composer_from_header, + E_TYPE_COMPOSER_HEADER) + static void composer_from_header_changed_cb (EAccountComboBox *combo_box, EComposerFromHeader *header) @@ -47,10 +51,8 @@ composer_from_header_refreshed_cb (EAccountComboBox *combo_box, } static void -composer_from_header_class_init (EComposerFromHeaderClass *class) +e_composer_from_header_class_init (EComposerFromHeaderClass *class) { - parent_class = g_type_class_peek_parent (class); - signal_ids[REFRESHED] = g_signal_new ( "refreshed", G_TYPE_FROM_CLASS (class), @@ -61,7 +63,7 @@ composer_from_header_class_init (EComposerFromHeaderClass *class) } static void -composer_from_header_init (EComposerFromHeader *header) +e_composer_from_header_init (EComposerFromHeader *header) { GtkWidget *widget; @@ -75,33 +77,6 @@ composer_from_header_init (EComposerFromHeader *header) E_COMPOSER_HEADER (header)->input_widget = widget; } -GType -e_composer_from_header_get_type (void) -{ - static GType type = 0; - - if (G_UNLIKELY (type == 0)) { - static const GTypeInfo type_info = { - sizeof (EComposerFromHeaderClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) composer_from_header_class_init, - (GClassFinalizeFunc) NULL, - NULL, /* class_data */ - sizeof (EComposerFromHeader), - 0, /* n_preallocs */ - (GInstanceInitFunc) composer_from_header_init, - NULL /* value_table */ - }; - - type = g_type_register_static ( - E_TYPE_COMPOSER_HEADER, "EComposerFromHeader", - &type_info, 0); - } - - return type; -} - EComposerHeader * e_composer_from_header_new (const gchar *label) { |