merge from trunk (r12122)

(bzr r11668.1.51)

2 files changed, 9 insertions, 59 deletions

diff --git a/src/helper/action.cpp b/src/helper/action.cpp
index 4fafa191e..0e9957ca3 100644
--- a/src/helper/action.cpp
+++ b/src/helper/action.cpp
@@ -19,34 +19,9 @@
 #include "document.h"
 #include "helper/action.h"
 
-static void sp_action_class_init (SPActionClass *klass);
-static void sp_action_init (SPAction *action);
 static void sp_action_finalize (GObject *object);
 
-static GObjectClass *parent_class;
-
-/**
- * Register SPAction class and return its type.
- */
-GType
-sp_action_get_type (void)
-{
-    static GType type = 0;
-    if (!type) {
-        GTypeInfo info = {
-            sizeof(SPActionClass),
-            NULL, NULL,
-            (GClassInitFunc) sp_action_class_init,
-            NULL, NULL,
-            sizeof(SPAction),
-            0,
-            (GInstanceInitFunc) sp_action_init,
-            NULL
-        };
-        type = g_type_register_static(G_TYPE_OBJECT, "SPAction", &info, (GTypeFlags)0);
-    }
-    return type;
-}
+G_DEFINE_TYPE(SPAction, sp_action, G_TYPE_OBJECT);
 
 /**
  * SPAction vtable initialization.
@@ -54,8 +29,6 @@ sp_action_get_type (void)
 static void
 sp_action_class_init (SPActionClass *klass)
 {
-    parent_class = (GObjectClass*) g_type_class_ref(G_TYPE_OBJECT);
-
     GObjectClass *object_class = (GObjectClass *) klass;
     object_class->finalize = sp_action_finalize;
 }
@@ -84,19 +57,19 @@ sp_action_init (SPAction *action)
 static void
 sp_action_finalize (GObject *object)
 {
-	SPAction *action = SP_ACTION(object);
+    SPAction *action = SP_ACTION(object);
 
-	g_free (action->image);
-	g_free (action->tip);
-	g_free (action->name);
-	g_free (action->id);
+    g_free (action->image);
+    g_free (action->tip);
+    g_free (action->name);
+    g_free (action->id);
 
     action->signal_perform.~signal();
     action->signal_set_sensitive.~signal();
     action->signal_set_active.~signal();
     action->signal_set_name.~signal();
 
-	parent_class->finalize (object);
+    G_OBJECT_CLASS(sp_action_parent_class)->finalize (object);
 }
 
 /**
diff --git a/src/helper/unit-menu.cpp b/src/helper/unit-menu.cpp
index bb2254a1b..af07c03c1 100644
--- a/src/helper/unit-menu.cpp
+++ b/src/helper/unit-menu.cpp
@@ -52,39 +52,16 @@ struct SPUnitSelectorClass {
 
 enum {SET_UNIT, LAST_SIGNAL};
 
-static void sp_unit_selector_class_init(SPUnitSelectorClass *klass);
-static void sp_unit_selector_init(SPUnitSelector *selector);
 static void sp_unit_selector_finalize(GObject *object);
 
-static GtkHBoxClass *unit_selector_parent_class;
 static guint signals[LAST_SIGNAL] = {0};
 
-GType sp_unit_selector_get_type(void)
-{
-    static GType type = 0;
-    if (!type) {
-        GTypeInfo info = {
-            sizeof(SPUnitSelectorClass),
-            0, // base_init
-            0, // base_finalize
-            (GClassInitFunc)sp_unit_selector_class_init,
-            0, // class_finalize
-            0, // class_data
-            sizeof(SPUnitSelector),
-            0, // n_preallocs
-            (GInstanceInitFunc)sp_unit_selector_init,
-            0 // value_table
-        };
-        type = g_type_register_static(GTK_TYPE_HBOX, "SPUnitSelector", &info, static_cast<GTypeFlags>(0));
-    }
-    return type;
-}
+G_DEFINE_TYPE(SPUnitSelector, sp_unit_selector, GTK_TYPE_HBOX);
 
 static void
 sp_unit_selector_class_init(SPUnitSelectorClass *klass)
 {
     GObjectClass *object_class = G_OBJECT_CLASS(klass);
-    unit_selector_parent_class = GTK_HBOX_CLASS(g_type_class_peek_parent(klass));
 
     signals[SET_UNIT] = g_signal_new("set_unit",
                                      G_TYPE_FROM_CLASS(klass),
@@ -142,7 +119,7 @@ sp_unit_selector_finalize(GObject *object)
 
     selector->unit = NULL;
 
-    G_OBJECT_CLASS(unit_selector_parent_class)->finalize(object);
+    G_OBJECT_CLASS(sp_unit_selector_parent_class)->finalize(object);
 }
 
 GtkWidget *