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

[herzi svn gnome org]

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

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

	* src/net/player.c: (network_player_init): use G_DEFINE_TYPE


Modified:
   trunk/ChangeLog
   trunk/src/net/player.c

Modified: trunk/src/net/player.c
==============================================================================
--- trunk/src/net/player.c	(original)
+++ trunk/src/net/player.c	Sat Feb  9 14:47:49 2008
@@ -29,11 +29,13 @@
 #define PRIVATE(self) (self->private )
 static GObjectClass* parent_class = NULL;
 
-struct NetworkPlayerPrivate 
+struct NetworkPlayerPrivate
 {
 	gchar * name;
 };
 
+G_DEFINE_TYPE (NetworkPlayer, network_player, G_TYPE_OBJECT);
+
 NetworkPlayer *
 network_player_new  (const gchar * name)
 {
@@ -50,8 +52,8 @@
 	return PRIVATE(player)->name;
 }
 
-static void 
-network_player_instance_init(NetworkPlayer * self) 
+static void
+network_player_init (NetworkPlayer* self)
 {
 	PRIVATE(self) = g_new0 (NetworkPlayerPrivate, 1);
 	PRIVATE(self)->name = NULL;
@@ -85,34 +87,3 @@
 
 }
 
-
-GType
-network_player_get_type (void)
-{
-	static GType	type = 0;
-
-	if (!type)
-	{
-		const GTypeInfo info = {
-			sizeof (NetworkPlayerClass),
-			NULL,	/* base initializer */
-			NULL,	/* base finalizer */
-			(GClassInitFunc)network_player_class_init,
-			NULL,	/* class finalizer */
-			NULL,	/* class data */
-			sizeof (NetworkPlayer),
-			1,
-			(GInstanceInitFunc) network_player_instance_init,
-			0
-		};
-
-		type = g_type_register_static (
-				G_TYPE_OBJECT,
-				"NetworkPlayer",
-				&info,
-				0);
-	}
-
-	return type;
-}
-