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

[herzi svn gnome org]

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

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

	* src/net/simple-server.c: (network_simple_server_init): use
	G_DEFINE_TYPE


Modified:
   trunk/ChangeLog
   trunk/src/net/simple-server.c

Modified: trunk/src/net/simple-server.c
==============================================================================
--- trunk/src/net/simple-server.c	(original)
+++ trunk/src/net/simple-server.c	Sat Feb  9 14:47:43 2008
@@ -81,6 +81,8 @@
 
 };
 
+G_DEFINE_TYPE (NetworkSimpleServer, network_simple_server, G_TYPE_OBJECT);
+
 NetworkSimpleServer *
 network_simple_server_new  (void)
 {
@@ -373,10 +375,10 @@
 
 }
 
-static void 
-network_simple_server_instance_init(NetworkSimpleServer * self) 
+static void
+network_simple_server_init (NetworkSimpleServer* self)
 {
-	PRIVATE(self) = g_new0 (NetworkSimpleServerPrivate, 1);			
+	PRIVATE(self) = g_new0 (NetworkSimpleServerPrivate, 1);
 	PRIVATE(self)->main_socket = -1;
 	PRIVATE(self)->is_running = FALSE;
 	PRIVATE(self)->main_thread = NULL;
@@ -386,7 +388,6 @@
 	PRIVATE(self)->current_id = 0;
 
 	PRIVATE(self)->game_manager = network_game_manager_new();
-
 }
 
 
@@ -443,34 +444,3 @@
 
 }
 
-
-GType
-network_simple_server_get_type (void)
-{
-	static GType	type = 0;
-
-	if (!type)
-	{
-		const GTypeInfo info = {
-			sizeof (NetworkSimpleServerClass),
-			NULL,	/* base initializer */
-			NULL,	/* base finalizer */
-			(GClassInitFunc)network_simple_server_class_init,
-			NULL,	/* class finalizer */
-			NULL,	/* class data */
-			sizeof (NetworkSimpleServer),
-			1,
-			(GInstanceInitFunc) network_simple_server_instance_init,
-			0
-		};
-
-		type = g_type_register_static (
-				G_TYPE_OBJECT,
-				"NetworkSimpleServer",
-				&info,
-				0);
-	}
-
-	return type;
-}
-