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

[herzi svn gnome org]

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

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

	* src/ui/game.c: (game_init): use G_DEFINE_TYPE


Modified:
   trunk/ChangeLog
   trunk/src/ui/game.c

Modified: trunk/src/ui/game.c
==============================================================================
--- trunk/src/ui/game.c	(original)
+++ trunk/src/ui/game.c	Sat Feb  9 14:47:02 2008
@@ -28,6 +28,8 @@
 
 static GObjectClass* parent_class = NULL;
 
+G_DEFINE_TYPE (Game, game, G_TYPE_OBJECT);
+
 static void game_finalize(GObject * object) {
 
   //  Game * game = GAME(object);
@@ -37,8 +39,9 @@
   }  
 }
 
-static void game_instance_init(Game * game) {
-}
+static void
+game_init (Game* self)
+{}
 
 static void game_class_init(GameClass* klass) {
 
@@ -60,37 +63,6 @@
     
 }
 
-GType game_get_type(void) {
-
-
-  static GType game_type = 0;
-
-
-  if (!game_type) {
-    static const GTypeInfo game_info = {
-      sizeof(GameClass),
-	NULL,           /* base_init */
-	NULL,           /* base_finalize */
-	(GClassInitFunc) game_class_init,
-	NULL,           /* class_finalize */
-	NULL,           /* class_data */
-	sizeof(Game),
-	1,              /* n_preallocs */
-	(GInstanceInitFunc) game_instance_init,
-
-    };
-
-      
-    game_type = g_type_register_static(G_TYPE_OBJECT,
-				       "Game",
-				       &game_info, 0);
-
-  }
-  
-  return game_type;
-}
-
-
 /**
  * game_start:
  * @game: a #Game