monkey-bubble r333 - in trunk: . src/net
- From: herzi svn gnome org
- To: svn-commits-list gnome org
- Subject: monkey-bubble r333 - in trunk: . src/net
- Date: Sat, 9 Feb 2008 14:47:37 +0000 (GMT)
Author: herzi
Date: Sat Feb 9 14:47:36 2008
New Revision: 333
URL: http://svn.gnome.org/viewvc/monkey-bubble?rev=333&view=rev
Log:
2008-02-09 Sven Herzberg <sven imendio com>
* src/net/client.c: (network_client_init),
(network_client_class_init): use G_DEFINE_TYPE
Modified:
trunk/ChangeLog
trunk/src/net/client.c
Modified: trunk/src/net/client.c
==============================================================================
--- trunk/src/net/client.c (original)
+++ trunk/src/net/client.c Sat Feb 9 14:47:36 2008
@@ -61,6 +61,8 @@
static void client_connection_closed(NetworkMessageHandler * mmh,
NetworkClient * client);
+G_DEFINE_TYPE (NetworkClient, network_client, G_TYPE_OBJECT);
+
NetworkClient *
network_client_new (guint32 client_id)
{
@@ -249,10 +251,8 @@
PRIVATE(client)->score++;
}
-
-
-static void
-network_client_instance_init(NetworkClient * self)
+static void
+network_client_init (NetworkClient* self)
{
PRIVATE(self) = g_new0 (NetworkClientPrivate, 1);
PRIVATE(self)->player = NULL;
@@ -260,7 +260,6 @@
PRIVATE(self)->state = NETWORK_CLIENT_NOT_READY;
}
-
static void
network_client_finalize (GObject * object)
{
@@ -379,37 +378,5 @@
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE,
0,NULL);
-
-}
-
-
-GType
-network_client_get_type (void)
-{
- static GType type = 0;
-
- if (!type)
- {
- const GTypeInfo info = {
- sizeof (NetworkClientClass),
- NULL, /* base initializer */
- NULL, /* base finalizer */
- (GClassInitFunc)network_client_class_init,
- NULL, /* class finalizer */
- NULL, /* class data */
- sizeof (NetworkClient),
- 1,
- (GInstanceInitFunc) network_client_instance_init,
- 0
- };
-
- type = g_type_register_static (
- G_TYPE_OBJECT,
- "NetworkClient",
- &info,
- 0);
- }
-
- return type;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]