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

[herzi svn gnome org]

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

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

	* src/ui/game-1-player.c: (game_1_player_init): use G_DEFINE_TYPE


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

Modified: trunk/src/ui/game-1-player.c
==============================================================================
--- trunk/src/ui/game-1-player.c	(original)
+++ trunk/src/ui/game-1-player.c	Sat Feb  9 14:46:02 2008
@@ -102,6 +102,7 @@
 static void time_paused(Game1Player * game);
 static void time_init(Game1Player * game);
 
+G_DEFINE_TYPE (Game1Player, game_1_player, TYPE_GAME);
 
 #ifdef MAEMO
 void game_1_player_save(Game1Player *game)
@@ -110,8 +111,10 @@
 }
 #endif
 
-static void game_1_player_instance_init(Game1Player * game) {
-        game->private =g_new0 (Game1PlayerPrivate, 1);		
+static void
+game_1_player_init (Game1Player* game)
+{
+	game->private = g_new0 (Game1PlayerPrivate, 1);
 }
 
 static void game_1_player_finalize(GObject* object) {
@@ -166,37 +169,6 @@
 
 }
 
-
-GType game_1_player_get_type(void) {
-        static GType game_1_player_type = 0;
-    
-        if (!game_1_player_type) {
-                static const GTypeInfo game_1_player_info = {
-                        sizeof(Game1PlayerClass),
-                        NULL,           /* base_init */
-                        NULL,           /* base_finalize */
-                        (GClassInitFunc) game_1_player_class_init,
-                        NULL,           /* class_finalize */
-                        NULL,           /* class_data */
-                        sizeof(Game1Player),
-                        1,              /* n_preallocs */
-                        (GInstanceInitFunc) game_1_player_instance_init,
-                };
-      
-      
-                game_1_player_type = g_type_register_static(TYPE_GAME,
-                                                            "Game1Player",
-                                                            &game_1_player_info, 0);
-
-
-
-        }
-    
-        return game_1_player_type;
-}
-
-
-
 static void game_1_player_bubble_sticked(Monkey * monkey,Bubble * b,
 					 Game1Player * game) {