diff options
Diffstat (limited to 'widgets/misc/e-signature-combo-box.c')
| -rw-r--r-- | widgets/misc/e-signature-combo-box.c | 45 |
1 files changed, 11 insertions, 34 deletions
diff --git a/widgets/misc/e-signature-combo-box.c b/widgets/misc/e-signature-combo-box.c index a70c9cc38a..540a9e769d 100644 --- a/widgets/misc/e-signature-combo-box.c +++ b/widgets/misc/e-signature-combo-box.c @@ -46,9 +46,13 @@ struct _ESignatureComboBoxPrivate { GHashTable *index; }; -static gpointer parent_class; static guint signal_ids[LAST_SIGNAL]; +G_DEFINE_TYPE ( + ESignatureComboBox, + e_signature_combo_box, + GTK_TYPE_COMBO_BOX) + static void signature_combo_box_refresh_cb (ESignatureList *signature_list, ESignature *unused, @@ -134,7 +138,8 @@ signature_combo_box_constructor (GType type, GtkCellRenderer *renderer; /* Chain up to parent's constructor() method. */ - object = G_OBJECT_CLASS (parent_class)->constructor ( + object = G_OBJECT_CLASS ( + e_signature_combo_box_parent_class)->constructor ( type, n_construct_properties, construct_properties); renderer = gtk_cell_renderer_text_new (); @@ -168,7 +173,7 @@ signature_combo_box_dispose (GObject *object) g_hash_table_remove_all (priv->index); /* Chain up to parent's dispose() method. */ - G_OBJECT_CLASS (parent_class)->dispose (object); + G_OBJECT_CLASS (e_signature_combo_box_parent_class)->dispose (object); } static void @@ -181,15 +186,14 @@ signature_combo_box_finalize (GObject *object) g_hash_table_destroy (priv->index); /* Chain up to parent's finalize() method. */ - G_OBJECT_CLASS (parent_class)->finalize (object); + G_OBJECT_CLASS (e_signature_combo_box_parent_class)->finalize (object); } static void -signature_combo_box_class_init (ESignatureComboBoxClass *class) +e_signature_combo_box_class_init (ESignatureComboBoxClass *class) { GObjectClass *object_class; - parent_class = g_type_class_peek_parent (class); g_type_class_add_private (class, sizeof (ESignatureComboBoxPrivate)); object_class = G_OBJECT_CLASS (class); @@ -207,7 +211,7 @@ signature_combo_box_class_init (ESignatureComboBoxClass *class) } static void -signature_combo_box_init (ESignatureComboBox *combo_box) +e_signature_combo_box_init (ESignatureComboBox *combo_box) { GHashTable *index; @@ -221,33 +225,6 @@ signature_combo_box_init (ESignatureComboBox *combo_box) combo_box->priv->index = index; } -GType -e_signature_combo_box_get_type (void) -{ - static GType type = 0; - - if (G_UNLIKELY (type == 0)) { - static const GTypeInfo type_info = { - sizeof (ESignatureComboBoxClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) signature_combo_box_class_init, - (GClassFinalizeFunc) NULL, - NULL, /* class_data */ - sizeof (ESignatureComboBox), - 0, /* n_preallocs */ - (GInstanceInitFunc) signature_combo_box_init, - NULL /* value_table */ - }; - - type = g_type_register_static ( - GTK_TYPE_COMBO_BOX, "ESignatureComboBox", - &type_info, 0); - } - - return type; -} - GtkWidget * e_signature_combo_box_new (void) { |