monkey-bubble r342 - in trunk: . src/input

[herzi svn gnome org]

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

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

	* src/input/player-input.c: (mb_player_input_init): use G_DEFINE_TYPE


Modified:
   trunk/ChangeLog
   trunk/src/input/player-input.c

Modified: trunk/src/input/player-input.c
==============================================================================
--- trunk/src/input/player-input.c	(original)
+++ trunk/src/input/player-input.c	Sat Feb  9 14:48:27 2008
@@ -77,6 +77,8 @@
 
 static void conf_keyboard(MbPlayerInput * self);
 
+G_DEFINE_TYPE (MbPlayerInput, mb_player_input, G_TYPE_OBJECT);
+
 MbPlayerInput *
 mb_player_input_new  (GtkWidget * window,
 		      GConfClient * client,
@@ -123,13 +125,12 @@
 	return self;
 }
 
-static void 
-mb_player_input_instance_init(MbPlayerInput * self) 
+static void
+mb_player_input_init (MbPlayerInput* self)
 {
-	PRIVATE(self) = g_new0 (MbPlayerInputPrivate, 1);			
+	PRIVATE(self) = g_new0 (MbPlayerInputPrivate, 1);
 }
 
-
 static void
 mb_player_input_finalize (GObject * object) 
 {
@@ -314,34 +315,3 @@
 
 }
 
-
-GType
-mb_player_input_get_type (void)
-{
-	static GType	type = 0;
-
-	if (!type)
-	{
-		const GTypeInfo info = {
-			sizeof (MbPlayerInputClass),
-			NULL,	/* base initializer */
-			NULL,	/* base finalizer */
-			(GClassInitFunc)mb_player_input_class_init,
-			NULL,	/* class finalizer */
-			NULL,	/* class data */
-			sizeof (MbPlayerInput),
-			1,
-			(GInstanceInitFunc) mb_player_input_instance_init,
-			0
-		};
-
-		type = g_type_register_static (
-				G_TYPE_OBJECT,
-				"MbPlayerInput",
-				&info,
-				0);
-	}
-
-	return type;
-}
-