monkey-bubble r330 - in trunk: . src/ui
- From: herzi svn gnome org
- To: svn-commits-list gnome org
- Subject: monkey-bubble r330 - in trunk: . src/ui
- Date: Sat, 9 Feb 2008 14:47:16 +0000 (GMT)
Author: herzi
Date: Sat Feb 9 14:47:16 2008
New Revision: 330
URL: http://svn.gnome.org/viewvc/monkey-bubble?rev=330&view=rev
Log:
2008-02-09 Sven Herzberg <sven imendio com>
* src/ui/game-2-player-manager.c: (game_2_player_manager_init): use
G_DEFINE_TYPE_WITH_CODE
Modified:
trunk/ChangeLog
trunk/src/ui/game-2-player-manager.c
Modified: trunk/src/ui/game-2-player-manager.c
==============================================================================
--- trunk/src/ui/game-2-player-manager.c (original)
+++ trunk/src/ui/game-2-player-manager.c Sat Feb 9 14:47:16 2008
@@ -42,8 +42,14 @@
static void game_2_player_manager_game_manager_iface_init(GameManagerClass * i);
static void game_2_player_manager_finalize(GObject* object);
-static void game_2_player_manager_instance_init(Game2PlayerManager * game_2_player_manager) {
- game_2_player_manager->private =g_new0 (Game2PlayerManagerPrivate, 1);
+
+G_DEFINE_TYPE_WITH_CODE (Game2PlayerManager, game_2_player_manager, G_TYPE_OBJECT,
+ G_IMPLEMENT_INTERFACE (TYPE_GAME_MANAGER, game_2_player_manager_game_manager_iface_init););
+
+static void
+game_2_player_manager_init (Game2PlayerManager* game_2_player_manager)
+{
+ game_2_player_manager->private = g_new0 (Game2PlayerManagerPrivate, 1);
}
@@ -55,50 +61,6 @@
object_class->finalize = game_2_player_manager_finalize;
}
-
-GType game_2_player_manager_get_type(void) {
- static GType game_2_player_manager_type = 0;
-
- if (!game_2_player_manager_type) {
- static const GTypeInfo game_2_player_manager_info = {
- sizeof(Game2PlayerManagerClass),
- NULL, /* base_init */
- NULL, /* base_finalize */
- (GClassInitFunc) game_2_player_manager_class_init,
- NULL, /* class_finalize */
- NULL, /* class_data */
- sizeof(Game2PlayerManager),
- 1, /* n_preallocs */
- (GInstanceInitFunc) game_2_player_manager_instance_init,
- };
-
-
-
-
- static const GInterfaceInfo iface_game_manager = {
- (GInterfaceInitFunc) game_2_player_manager_game_manager_iface_init,
- NULL,
- NULL
- };
-
- game_2_player_manager_type = g_type_register_static(G_TYPE_OBJECT,
- "Game2PlayerManager",
- &game_2_player_manager_info,
- 0);
-
-
-
- g_type_add_interface_static(game_2_player_manager_type,
- TYPE_GAME_MANAGER,
- &iface_game_manager);
-
-
- }
-
- return game_2_player_manager_type;
-}
-
-
Game2PlayerManager * game_2_player_manager_new(GtkWidget * window,MonkeyCanvas * canvas) {
Game2PlayerManager * game_2_player_manager;
game_2_player_manager = GAME_2_PLAYER_MANAGER (g_object_new (TYPE_GAME_2_PLAYER_MANAGER, NULL));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]