[vino] Old g-object style removed



commit 85b2997050bd3ede8b57d10d45f07aab90b31728
Author: Arnaud Maillet <arnaud maillet collabora co uk>
Date:   Mon May 18 17:24:18 2009 +0200

    Old g-object style removed
---
 server/vino-server.c |   33 +++------------------------------
 1 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/server/vino-server.c b/server/vino-server.c
index 532c4b8..c22f5cc 100644
--- a/server/vino-server.c
+++ b/server/vino-server.c
@@ -46,6 +46,8 @@
 #include <gnome-keyring.h>
 #endif
 
+G_DEFINE_TYPE (VinoServer, vino_server, G_TYPE_OBJECT);
+
 /* If an authentication attempt failes, delay the next
  * authentication attempt for 5 seconds.
  */
@@ -1252,7 +1254,7 @@ vino_server_get_property (GObject    *object,
 }
 
 static void
-vino_server_instance_init (VinoServer *server)
+vino_server_init (VinoServer *server)
 {
   server->priv = g_new0 (VinoServerPrivate, 1);
 }
@@ -1455,35 +1457,6 @@ vino_server_class_init (VinoServerClass *klass)
 
 }
 
-GType
-vino_server_get_type (void)
-{
-  static GType object_type = 0;
-
-  if (!object_type)
-    {
-      static const GTypeInfo object_info =
-	{
-	  sizeof (VinoServerClass),
-	  (GBaseInitFunc) NULL,
-	  (GBaseFinalizeFunc) NULL,
-	  (GClassInitFunc) vino_server_class_init,
-	  NULL,           /* class_finalize */
-	  NULL,           /* class_data */
-	  sizeof (VinoServer),
-	  0,              /* n_preallocs */
-	  (GInstanceInitFunc) vino_server_instance_init,
-	};
-      
-      object_type = g_type_register_static (G_TYPE_OBJECT,
-                                            "VinoServer",
-                                            &object_info, 0);
-    }
-
-  return object_type;
-}
-
-
 VinoServer *
 vino_server_new (GdkScreen *screen,
 		 gboolean   view_only)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]