monkey-bubble r326 - in trunk: . src/ui

[herzi svn gnome org]

Author: herzi
Date: Sat Feb  9 14:46:46 2008
New Revision: 326
URL: http://svn.gnome.org/viewvc/monkey-bubble?rev=326&view=rev

Log:
2008-02-08  Sven Herzberg  <sven imendio com>

	* src/ui/ui-main.c: use G_DEFINE_TYPE


Modified:
   trunk/ChangeLog
   trunk/src/ui/ui-main.c

Modified: trunk/src/ui/ui-main.c
==============================================================================
--- trunk/src/ui/ui-main.c	(original)
+++ trunk/src/ui/ui-main.c	Sat Feb  9 14:46:46 2008
@@ -148,6 +148,7 @@
 
 static UiMain* ui_main_new(void);
 
+G_DEFINE_TYPE (UiMain, ui_main, G_TYPE_OBJECT);
 
 #ifdef MAEMO
 static void ui_main_topmost_cb(GObject *self, GParamSpec *property_param, gpointer null)
@@ -176,34 +177,6 @@
 }
 #endif
 
-GType ui_main_get_type(void) {
-        static GType ui_main_type = 0;
-
-        if(!ui_main_type) {
-
-                static const GTypeInfo ui_main_info = {
-                        sizeof(UiMainClass),
-                        NULL,           /* base_init */
-                        NULL,           /* base_finalize */
-                        (GClassInitFunc) ui_main_class_init,
-                        NULL,           /* class_finalize */
-                        NULL,           /* class_data */
-                        sizeof(UiMain),
-                        1,              /* n_preallocs */
-                        (GInstanceInitFunc) ui_main_init,
-                };
-    
-
-                ui_main_type = g_type_register_static(G_TYPE_OBJECT,
-                                                      "UiMain",
-                                                      &ui_main_info, 0);
-
-
-        }
-        return ui_main_type;
-}
-
-
 UiMain * ui_main_get_instance(void) {
         static UiMain * instance = NULL;