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

[herzi svn gnome org]

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

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

	* src/ui/game-network-player.c: (game_network_player_init): use
	G_DEFINE_TYPE


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

Modified: trunk/src/ui/game-network-player.c
==============================================================================
--- trunk/src/ui/game-network-player.c	(original)
+++ trunk/src/ui/game-network-player.c	Sat Feb  9 14:46:55 2008
@@ -122,9 +122,10 @@
 static void time_paused (GameNetworkPlayer * game);
 static void time_init (GameNetworkPlayer * game);
 
+G_DEFINE_TYPE (GameNetworkPlayer, game_network_player, TYPE_GAME);
 
 static void
-game_network_player_instance_init (GameNetworkPlayer * game)
+game_network_player_init (GameNetworkPlayer* game)
 {
 	game->private = g_new0 (GameNetworkPlayerPrivate, 1);
 	PRIVATE (game)->lock = g_mutex_new ();
@@ -198,41 +199,6 @@
 
 }
 
-
-GType
-game_network_player_get_type (void)
-{
-	static GType game_network_player_type = 0;
-
-	if (!game_network_player_type)
-	{
-		static const GTypeInfo game_network_player_info = {
-			sizeof (GameNetworkPlayerClass),
-			NULL,	/* base_init */
-			NULL,	/* base_finalize */
-			(GClassInitFunc) game_network_player_class_init,
-			NULL,	/* class_finalize */
-			NULL,	/* class_data */
-			sizeof (GameNetworkPlayer),
-			1,	/* n_preallocs */
-			(GInstanceInitFunc) game_network_player_instance_init,
-		};
-
-
-		game_network_player_type = g_type_register_static (TYPE_GAME,
-								   "GameNetworkPlayer",
-								   &game_network_player_info,
-								   0);
-
-
-
-	}
-
-	return game_network_player_type;
-}
-
-
-
 static void
 game_network_player_bubble_sticked (Monkey * monkey, Bubble * b,
 				    GameNetworkPlayer * game)