[telepathy-gabble/master] Use constructed instead of constructor

Sjoerd Simons sjoerd.simons at collabora.co.uk
Tue Dec 29 05:35:03 PST 2009


---
 src/call-stream.c |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/call-stream.c b/src/call-stream.c
index 6afca57..ff33bdf 100644
--- a/src/call-stream.c
+++ b/src/call-stream.c
@@ -173,18 +173,12 @@ gabble_call_stream_set_property (GObject *object,
     }
 }
 
-static GObject *
-gabble_call_stream_constructor (GType type,
-    guint n_props,
-    GObjectConstructParam *props)
+static void
+gabble_call_stream_constructed (GObject *obj)
 {
-  GObject *obj;
   GabbleCallStreamPrivate *priv;
   DBusGConnection *bus;
 
-  obj = G_OBJECT_CLASS (gabble_call_stream_parent_class)->
-           constructor (type, n_props, props);
-
   priv = GABBLE_CALL_STREAM (obj)->priv;
 
   /* register object on the bus */
@@ -192,7 +186,8 @@ gabble_call_stream_constructor (GType type,
   DEBUG ("Registering %s", priv->object_path);
   dbus_g_connection_register_g_object (bus, priv->object_path, obj);
 
-  return obj;
+  if (G_OBJECT_CLASS (gabble_call_stream_parent_class)->constructed != NULL)
+    G_OBJECT_CLASS (gabble_call_stream_parent_class)->constructed (obj);
 }
 
 static void
@@ -229,7 +224,7 @@ gabble_call_stream_class_init (GabbleCallStreamClass *gabble_call_stream_class)
 
   object_class->dispose = gabble_call_stream_dispose;
   object_class->finalize = gabble_call_stream_finalize;
-  object_class->constructor = gabble_call_stream_constructor;
+  object_class->constructed = gabble_call_stream_constructed;
 
   param_spec = g_param_spec_string ("object-path", "D-Bus object path",
       "The D-Bus object path used for this "
-- 
1.5.6.5




More information about the telepathy-commits mailing list