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

[herzi svn gnome org]

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

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

	* src/ui/game-2-player.c: (game_2_player_init),
	(game_2_player_class_init): use G_DEFINE_TYPE


Modified:
   trunk/ChangeLog
   trunk/src/ui/game-2-player.c

Modified: trunk/src/ui/game-2-player.c
==============================================================================
--- trunk/src/ui/game-2-player.c	(original)
+++ trunk/src/ui/game-2-player.c	Sat Feb  9 14:46:38 2008
@@ -105,6 +105,7 @@
 static void time_paused(Game2Player * game);
 static void time_init(Game2Player * game);
 
+G_DEFINE_TYPE (Game2Player, game_2_player, TYPE_GAME);
 
 static void 
 game_2_player_finalize(GObject* object)
@@ -671,10 +672,10 @@
 }
 
 
-static void 
-game_2_player_instance_init(Game2Player * game) 
+static void
+game_2_player_init (Game2Player* game)
 {
-        game->private =g_new0 (Game2PlayerPrivate, 2);		
+	game->private = g_new0 (Game2PlayerPrivate, 2);
 }
 
 static void
@@ -693,37 +694,5 @@
         i->stop = game_2_player_stop;
         i->pause = game_2_player_pause;
         i->get_state = game_2_player_get_state;
-        
 }
 
-
-GType 
-game_2_player_get_type(void) 
-{
-        static GType game_2_player_type = 0;
-    
-        if (!game_2_player_type) {
-                static const GTypeInfo game_2_player_info = {
-                        sizeof(Game2PlayerClass),
-                        NULL,           /* base_init */
-                        NULL,           /* base_finalize */
-                        (GClassInitFunc) game_2_player_class_init,
-                        NULL,           /* class_finalize */
-                        NULL,           /* class_data */
-                        sizeof(Game2Player),
-                        2,              /* n_preallocs */
-                        (GInstanceInitFunc) game_2_player_instance_init,
-                };
-
-
-
-      
-      
-                game_2_player_type = g_type_register_static(TYPE_GAME,
-                                                            "Game2Player",
-                                                            &game_2_player_info, 0);
-    
-        }
-        
-        return game_2_player_type;
-}