monkey-bubble r336 - in trunk: . src/net

[herzi svn gnome org]

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

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

	* src/net/game-manager.c: (network_game_manager_init): use
	G_DEFINE_TYPE


Modified:
   trunk/ChangeLog
   trunk/src/net/game-manager.c

Modified: trunk/src/net/game-manager.c
==============================================================================
--- trunk/src/net/game-manager.c	(original)
+++ trunk/src/net/game-manager.c	Sat Feb  9 14:47:56 2008
@@ -81,6 +81,8 @@
 
 static void start_game(NetworkGameManager * manager);
 
+G_DEFINE_TYPE (NetworkGameManager, network_game_manager, G_TYPE_OBJECT);
+
 NetworkGameManager *
 network_game_manager_new  (void)
 {
@@ -220,10 +222,10 @@
 	g_mutex_unlock( PRIVATE(manager)->started_lock);
 }
 
-static void 
-network_game_manager_instance_init(NetworkGameManager * self) 
+static void
+network_game_manager_init (NetworkGameManager* self)
 {
-	PRIVATE(self) = g_new0 (NetworkGameManagerPrivate, 1);			
+	PRIVATE(self) = g_new0 (NetworkGameManagerPrivate, 1);
 	PRIVATE(self)->clients = NULL;
 	PRIVATE(self)->id_hash_table = 
 		g_hash_table_new(g_int_hash,g_int_equal);
@@ -590,34 +592,3 @@
 
 }
 
-
-GType
-network_game_manager_get_type (void)
-{
-	static GType	type = 0;
-
-	if (!type)
-	{
-		const GTypeInfo info = {
-			sizeof (NetworkGameManagerClass),
-			NULL,	/* base initializer */
-			NULL,	/* base finalizer */
-			(GClassInitFunc)network_game_manager_class_init,
-			NULL,	/* class finalizer */
-			NULL,	/* class data */
-			sizeof (NetworkGameManager),
-			1,
-			(GInstanceInitFunc) network_game_manager_instance_init,
-			0
-		};
-
-		type = g_type_register_static (
-				G_TYPE_OBJECT,
-				"NetworkGameManager",
-				&info,
-				0);
-	}
-
-	return type;
-}
-