Revision: 3549 http://geany.svn.sourceforge.net/geany/?rev=3549&view=rev Author: eht16 Date: 2009-02-05 19:04:54 +0000 (Thu, 05 Feb 2009)
Log Message: ----------- Use the G_DEFINE_TYPE() macro to generate the *_get_type() code. Remove useless geany_object_finalize() function.
Modified Paths: -------------- trunk/ChangeLog trunk/src/geanyentryaction.c trunk/src/geanymenubuttonaction.c trunk/src/geanyobject.c trunk/src/geanywraplabel.c
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-02-05 17:07:09 UTC (rev 3548) +++ trunk/ChangeLog 2009-02-05 19:04:54 UTC (rev 3549) @@ -1,3 +1,11 @@ +2009-02-05 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/geanymenubuttonaction.c, src/geanyentryaction.c, + src/geanyobject.c, src/geanywraplabel.c: + Use the G_DEFINE_TYPE() macro to generate the *_get_type() code. + Remove useless geany_object_finalize() function. + + 2009-02-04 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* src/vte.c, src/vte.h:
Modified: trunk/src/geanyentryaction.c =================================================================== --- trunk/src/geanyentryaction.c 2009-02-05 17:07:09 UTC (rev 3548) +++ trunk/src/geanyentryaction.c 2009-02-05 19:04:54 UTC (rev 3549) @@ -53,35 +53,9 @@ static guint signals[LAST_SIGNAL];
-static void geany_entry_action_class_init (GeanyEntryActionClass *klass); -static void geany_entry_action_init (GeanyEntryAction *action); +G_DEFINE_TYPE(GeanyEntryAction, geany_entry_action, GTK_TYPE_ACTION);
-static GtkActionClass *parent_class = NULL;
-GType geany_entry_action_get_type(void) -{ - static GType self_type = 0; - if (! self_type) - { - static const GTypeInfo self_info = - { - sizeof(GeanyEntryActionClass), - NULL, NULL, - (GClassInitFunc)geany_entry_action_class_init, - NULL, NULL, - sizeof(GeanyEntryAction), - 0, - (GInstanceInitFunc)geany_entry_action_init, - NULL - }; - - self_type = g_type_register_static(GTK_TYPE_ACTION, "GeanyEntryAction", &self_info, 0); - } - - return self_type; -} - - static GtkWidget *geany_entry_action_create_tool_item(GtkAction *action) { GtkWidget *toolitem; @@ -138,7 +112,7 @@ g_signal_connect(priv->entry, "changed", G_CALLBACK(delegate_entry_changed_cb), action); g_signal_connect(priv->entry, "activate", G_CALLBACK(delegate_entry_activate_cb), action);
- GTK_ACTION_CLASS(parent_class)->connect_proxy(action, widget); + GTK_ACTION_CLASS(geany_entry_action_parent_class)->connect_proxy(action, widget); }
@@ -150,8 +124,7 @@ action_class->create_tool_item = geany_entry_action_create_tool_item; action_class->toolbar_item_type = GTK_TYPE_MENU_TOOL_BUTTON;
- parent_class = (GtkActionClass*)g_type_class_peek(GTK_TYPE_ACTION); - g_type_class_add_private((gpointer)klass, sizeof(GeanyEntryActionPrivate)); + g_type_class_add_private(klass, sizeof(GeanyEntryActionPrivate));
signals[ENTRY_CHANGED] = g_signal_new("entry-changed", G_TYPE_FROM_CLASS(klass),
Modified: trunk/src/geanymenubuttonaction.c =================================================================== --- trunk/src/geanymenubuttonaction.c 2009-02-05 17:07:09 UTC (rev 3548) +++ trunk/src/geanymenubuttonaction.c 2009-02-05 19:04:54 UTC (rev 3549) @@ -51,43 +51,16 @@ static guint signals[LAST_SIGNAL];
-static void geany_menu_button_action_class_init (GeanyMenubuttonActionClass *klass); -static void geany_menu_button_action_init (GeanyMenubuttonAction *action); +G_DEFINE_TYPE(GeanyMenubuttonAction, geany_menu_button_action, GTK_TYPE_ACTION);
-static GtkActionClass *parent_class = NULL;
-GType geany_menu_button_action_get_type(void) -{ - static GType self_type = 0; - if (! self_type) - { - static const GTypeInfo self_info = - { - sizeof(GeanyMenubuttonActionClass), - NULL, NULL, - (GClassInitFunc)geany_menu_button_action_class_init, - NULL, NULL, - sizeof(GeanyMenubuttonAction), - 0, - (GInstanceInitFunc)geany_menu_button_action_init, - NULL - }; - - self_type = g_type_register_static(GTK_TYPE_ACTION, "GeanyMenubuttonAction", &self_info, 0); - } - - return self_type; -} - - static void geany_menu_button_action_finalize(GObject *object) { GeanyMenubuttonActionPrivate *priv = GEANY_MENU_BUTTON_ACTION_GET_PRIVATE(object);
g_object_unref(priv->menu);
- if (G_OBJECT_CLASS(parent_class)->finalize) - (* G_OBJECT_CLASS(parent_class)->finalize)(object); + (* G_OBJECT_CLASS(geany_menu_button_action_parent_class)->finalize)(object); }
@@ -109,7 +82,7 @@ /* add the menu to the menu button once it got items ("add" from GtkContainer) */ g_signal_connect(priv->menu, "add", G_CALLBACK(menu_filled_cb), action);
- GTK_ACTION_CLASS(parent_class)->connect_proxy(action, widget); + GTK_ACTION_CLASS(geany_menu_button_action_parent_class)->connect_proxy(action, widget); }
@@ -145,8 +118,7 @@ action_class->create_tool_item = geany_menu_button_action_create_tool_item; action_class->toolbar_item_type = GTK_TYPE_MENU_TOOL_BUTTON;
- parent_class = (GtkActionClass*)g_type_class_peek(GTK_TYPE_ACTION); - g_type_class_add_private((gpointer)klass, sizeof(GeanyMenubuttonActionPrivate)); + g_type_class_add_private(klass, sizeof(GeanyMenubuttonActionPrivate));
signals[BUTTON_CLICKED] = g_signal_new("button-clicked", G_TYPE_FROM_CLASS(klass),
Modified: trunk/src/geanyobject.c =================================================================== --- trunk/src/geanyobject.c 2009-02-05 17:07:09 UTC (rev 3548) +++ trunk/src/geanyobject.c 2009-02-05 19:04:54 UTC (rev 3549) @@ -51,39 +51,11 @@ gchar dummy; };
-static void geany_object_class_init (GeanyObjectClass *klass); -static void geany_object_init (GeanyObject *self); -static void geany_object_finalize (GObject *object);
-/* Local data */ -static GObjectClass *parent_class = NULL; +G_DEFINE_TYPE(GeanyObject, geany_object, G_TYPE_OBJECT);
-GType geany_object_get_type(void) -{ - static GType self_type = 0; - if (! self_type) - { - static const GTypeInfo self_info = - { - sizeof(GeanyObjectClass), - NULL, /* base_init */ - NULL, /* base_finalize */ - (GClassInitFunc)geany_object_class_init, - NULL, /* class_finalize */ - NULL, /* class_data */ - sizeof(GeanyObject), - 0, - (GInstanceInitFunc)geany_object_init, - NULL - };
- self_type = g_type_register_static(G_TYPE_OBJECT, "GeanyObject", &self_info, 0); } - - return self_type; -} - - static void geany_cclosure_marshal_VOID__STRING_INT_POINTER(GClosure *closure, GValue *ret_val, guint n_param_vals, const GValue *param_values, gpointer hint, gpointer mdata) { @@ -278,14 +250,10 @@ static void geany_object_class_init(GeanyObjectClass *klass) { GObjectClass *g_object_class; - g_object_class = G_OBJECT_CLASS(klass);
- g_object_class->finalize = geany_object_finalize; + g_type_class_add_private(klass, sizeof(GeanyObjectPrivate));
- parent_class = (GObjectClass*)g_type_class_peek(G_TYPE_OBJECT); - g_type_class_add_private((gpointer)klass, sizeof(GeanyObjectPrivate)); - create_signals(g_object_class); }
@@ -301,17 +269,3 @@ return (GObject*)g_object_new(GEANY_OBJECT_TYPE, NULL); }
- -static void geany_object_finalize(GObject *object) -{ - GeanyObject *self; - - g_return_if_fail(object != NULL); - g_return_if_fail(IS_GEANY_OBJECT(object)); - - self = GEANY_OBJECT(object); - - if (G_OBJECT_CLASS(parent_class)->finalize) - (* G_OBJECT_CLASS(parent_class)->finalize)(object); -} -
Modified: trunk/src/geanywraplabel.c =================================================================== --- trunk/src/geanywraplabel.c 2009-02-05 17:07:09 UTC (rev 3548) +++ trunk/src/geanywraplabel.c 2009-02-05 19:04:54 UTC (rev 3549) @@ -31,11 +31,7 @@ #include "geanywraplabel.h"
-/* Local data */ -static GObjectClass *parent_class = NULL;
- - #define GEANY_WRAP_LABEL_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj),\ GEANY_WRAP_LABEL_TYPE, GeanyWrapLabelPrivate))
@@ -56,44 +52,17 @@ } GeanyWrapLabelPrivate;
-static void geany_wrap_label_class_init (GeanyWrapLabelClass *klass); -static void geany_wrap_label_init (GeanyWrapLabel *self); static void geany_wrap_label_size_request (GtkWidget *widget, GtkRequisition *req); static void geany_wrap_label_size_allocate (GtkWidget *widget, GtkAllocation *alloc); static void geany_wrap_label_set_wrap_width (GtkWidget *widget, gsize width);
+G_DEFINE_TYPE(GeanyWrapLabel, geany_wrap_label, GTK_TYPE_LABEL);
-GType geany_wrap_label_get_type() -{ - static GType type = G_TYPE_INVALID; - - if (G_UNLIKELY(type == G_TYPE_INVALID)) - { - GTypeInfo gwl_info = { - sizeof (GeanyWrapLabelClass), - NULL, NULL, - (GClassInitFunc) geany_wrap_label_class_init, - NULL, - NULL, - sizeof (GeanyWrapLabel), - 3, - (GInstanceInitFunc) geany_wrap_label_init, - NULL - }; - - type = g_type_register_static(GTK_TYPE_LABEL, "GeanyWrapLabel", &gwl_info, 0); - } - - return type; -} - - static void geany_wrap_label_class_init(GeanyWrapLabelClass *klass) { GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
- parent_class = g_type_class_peek_parent(klass); widget_class->size_request = geany_wrap_label_size_request; widget_class->size_allocate = geany_wrap_label_size_allocate;
@@ -148,7 +117,7 @@ /* Sets the wrap width to the width allocated to us. */ static void geany_wrap_label_size_allocate(GtkWidget *widget, GtkAllocation *alloc) { - (* GTK_WIDGET_CLASS(parent_class)->size_allocate)(widget, alloc); + (* GTK_WIDGET_CLASS(geany_wrap_label_parent_class)->size_allocate)(widget, alloc);
geany_wrap_label_set_wrap_width(widget, alloc->width); }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.