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

[herzi svn gnome org]

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

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

	* src/ui/game-1-player-manager.c: (game_1_player_manager_init): use
	G_DEFINE_TYPE_WITH_CODE


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

Modified: trunk/src/ui/game-1-player-manager.c
==============================================================================
--- trunk/src/ui/game-1-player-manager.c	(original)
+++ trunk/src/ui/game-1-player-manager.c	Sat Feb  9 14:46:12 2008
@@ -48,8 +48,14 @@
 static void game_1_player_manager_game_manager_iface_init(GameManagerClass * i);
 
 static void game_1_player_manager_finalize(GObject* object);
-static void game_1_player_manager_instance_init(Game1PlayerManager * game_1_player_manager) {
-  game_1_player_manager->private =g_new0 (Game1PlayerManagerPrivate, 1);			
+
+G_DEFINE_TYPE_WITH_CODE (Game1PlayerManager, game_1_player_manager, G_TYPE_OBJECT,
+			 G_IMPLEMENT_INTERFACE (TYPE_GAME_MANAGER, game_1_player_manager_game_manager_iface_init));
+
+static void
+game_1_player_manager_init (Game1PlayerManager* game_1_player_manager)
+{
+	game_1_player_manager->private = g_new0 (Game1PlayerManagerPrivate, 1);
 }
 
 
@@ -61,47 +67,6 @@
   object_class->finalize = game_1_player_manager_finalize;
 }
 
-
-GType game_1_player_manager_get_type(void) {
-  static GType game_1_player_manager_type = 0;
-    
-  if (!game_1_player_manager_type) {
-    static const GTypeInfo game_1_player_manager_info = {
-      sizeof(Game1PlayerManagerClass),
-      NULL,           /* base_init */
-      NULL,           /* base_finalize */
-      (GClassInitFunc) game_1_player_manager_class_init,
-      NULL,           /* class_finalize */
-      NULL,           /* class_data */
-      sizeof(Game1PlayerManager),
-      1,              /* n_preallocs */
-      (GInstanceInitFunc) game_1_player_manager_instance_init,
-    };
-
-
-    static const GInterfaceInfo iface_game_manager = {
-      (GInterfaceInitFunc) game_1_player_manager_game_manager_iface_init,
-      NULL,
-      NULL
-    };
-      
-    game_1_player_manager_type = g_type_register_static(G_TYPE_OBJECT,
-							"Game1PlayerManager",
-							&game_1_player_manager_info,
-							0);
-	 
-	 
-    g_type_add_interface_static(game_1_player_manager_type,
-				TYPE_GAME_MANAGER,
-				&iface_game_manager);
-      
-      
-  }
-    
-  return game_1_player_manager_type;
-}
-
-
 Game1PlayerManager * game_1_player_manager_new(GtkWidget * window,MonkeyCanvas * canvas) {
   Game1PlayerManager * game_1_player_manager;
   game_1_player_manager = GAME_1_PLAYER_MANAGER (g_object_new (TYPE_GAME_1_PLAYER_MANAGER, NULL));