telepathy-idle: IMManager: replace constructor with constructed.

Will Thompson wjt at kemper.freedesktop.org
Wed Aug 1 03:11:39 PDT 2012


Module: telepathy-idle
Branch: master
Commit: 2c5a91e26f4dd098465f0b32013bc0b3d0edeceb
URL:    http://cgit.freedesktop.org/telepathy/telepathy-idle/commit/?id=2c5a91e26f4dd098465f0b32013bc0b3d0edeceb

Author: Will Thompson <will.thompson at collabora.co.uk>
Date:   Thu Jul 19 12:13:41 2012 +0100

IMManager: replace constructor with constructed.

---

 src/idle-im-manager.c |   26 ++++++++------------------
 1 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/src/idle-im-manager.c b/src/idle-im-manager.c
index 7558526..1d3a73c 100644
--- a/src/idle-im-manager.c
+++ b/src/idle-im-manager.c
@@ -33,7 +33,7 @@
 #include "idle-text.h"
 
 static void _im_manager_iface_init(gpointer g_iface, gpointer iface_data);
-static GObject * _im_manager_constructor (GType type, guint n_props, GObjectConstructParam *props);
+static void _im_manager_constructed (GObject *obj);
 static void _im_manager_dispose (GObject *object);
 
 G_DEFINE_TYPE_WITH_CODE(IdleIMManager, idle_im_manager, G_TYPE_OBJECT,
@@ -128,7 +128,7 @@ static void idle_im_manager_class_init(IdleIMManagerClass *klass) {
 
 	g_type_class_add_private(klass, sizeof(IdleIMManagerPrivate));
 
-	object_class->constructor = _im_manager_constructor;
+	object_class->constructed = _im_manager_constructed;
 	object_class->dispose = _im_manager_dispose;
 	object_class->get_property = idle_im_manager_get_property;
 	object_class->set_property = idle_im_manager_set_property;
@@ -137,30 +137,20 @@ static void idle_im_manager_class_init(IdleIMManagerClass *klass) {
 	g_object_class_install_property(object_class, PROP_CONNECTION, param_spec);
 }
 
-static GObject *
-_im_manager_constructor (GType type,
-						 guint n_props,
-						 GObjectConstructParam *props)
+static void
+_im_manager_constructed (GObject *obj)
 {
-	GObject *obj;
-	IdleIMManager *self;
-	IdleIMManagerPrivate *priv;
-
-	obj = G_OBJECT_CLASS (idle_im_manager_parent_class)->constructor (type,
-																	  n_props,
-																	  props);
+	IdleIMManager *self = IDLE_IM_MANAGER (obj);
+	IdleIMManagerPrivate *priv = IDLE_IM_MANAGER_GET_PRIVATE (self);
 
-	self = IDLE_IM_MANAGER (obj);
-	priv = IDLE_IM_MANAGER_GET_PRIVATE (self);
+	G_OBJECT_CLASS (idle_im_manager_parent_class)->constructed (obj);
 
-	g_return_val_if_fail (priv->conn, obj);
+	g_return_if_fail (priv->conn);
 
 	priv->status_changed_id = g_signal_connect (priv->conn,
 												"status-changed", (GCallback)
 												connection_status_changed_cb,
 												self);
-
-	return obj;
 }
 
 



More information about the telepathy-commits mailing list