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

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


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

diff --git a/src/call-channel.c b/src/call-channel.c
index 33091be..8ceb4f6 100644
--- a/src/call-channel.c
+++ b/src/call-channel.c
@@ -121,19 +121,13 @@ struct _GabbleCallChannelPrivate
   gchar *transport_ns;
 };
 
-static GObject *
-gabble_call_channel_constructor (GType type,
-    guint n_props,
-    GObjectConstructParam *props)
+static void
+gabble_call_channel_constructed (GObject *obj)
 {
-  GObject *obj;
   GabbleCallChannelPrivate *priv;
   TpBaseConnection *conn;
   TpHandleRepoIface *contact_handles;
 
-  obj = G_OBJECT_CLASS (gabble_call_channel_parent_class)->
-           constructor (type, n_props, props);
-
   priv = GABBLE_CALL_CHANNEL (obj)->priv;
   conn = (TpBaseConnection *) priv->conn;
   contact_handles = tp_base_connection_get_handles (conn,
@@ -151,7 +145,8 @@ gabble_call_channel_constructor (GType type,
   g_assert (priv->creator != 0);
   tp_handle_ref (contact_handles, priv->creator);
 
-  return obj;
+  if (G_OBJECT_CLASS (gabble_call_channel_parent_class)->constructed != NULL)
+    G_OBJECT_CLASS (gabble_call_channel_parent_class)->constructed (obj);
 }
 
 static void
@@ -360,7 +355,7 @@ gabble_call_channel_class_init (
   g_type_class_add_private (gabble_call_channel_class,
       sizeof (GabbleCallChannelPrivate));
 
-  object_class->constructor = gabble_call_channel_constructor;
+  object_class->constructed = gabble_call_channel_constructed;
 
   object_class->get_property = gabble_call_channel_get_property;
   object_class->set_property = gabble_call_channel_set_property;
-- 
1.5.6.5




More information about the telepathy-commits mailing list