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

[herzi svn gnome org]

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

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

	* src/ui/keyboard-properties.c: use G_DEFINE_TYPE


Modified:
   trunk/ChangeLog
   trunk/src/ui/keyboard-properties.c

Modified: trunk/src/ui/keyboard-properties.c
==============================================================================
--- trunk/src/ui/keyboard-properties.c	(original)
+++ trunk/src/ui/keyboard-properties.c	Sat Feb  9 14:45:43 2008
@@ -140,6 +140,8 @@
   GtkTreeModel *model;
 };
 
+G_DEFINE_TYPE (KeyboardProperties, keyboard_properties, G_TYPE_OBJECT);
+
 static void keyboard_properties_class_init(KeyboardPropertiesClass* klass);
 
 static void keyboard_properties_init(KeyboardProperties* main);
@@ -153,35 +155,6 @@
 
 static KeyboardProperties* keyboard_properties_new(void);
 
-
-GType keyboard_properties_get_type(void) {
-  static GType keyboard_properties_type = 0;
-
-  if(!keyboard_properties_type) {
-
-    static const GTypeInfo keyboard_properties_info = {
-      sizeof(KeyboardPropertiesClass),
-      NULL,           /* base_init */
-      NULL,           /* base_finalize */
-      (GClassInitFunc) keyboard_properties_class_init,
-      NULL,           /* class_finalize */
-      NULL,           /* class_data */
-      sizeof(KeyboardProperties),
-      1,              /* n_preallocs */
-      (GInstanceInitFunc) keyboard_properties_init,
-    };
-    
-
-    keyboard_properties_type = g_type_register_static(G_TYPE_OBJECT,
-					  "KeyboardProperties",
-					  &keyboard_properties_info, 0);
-
-
-  }
-  return keyboard_properties_type;
-}
-
-
 static KeyboardProperties * instance = NULL;