[telepathy-glib/master] _tp_account_manager_account_ready_cb: fix b.fd.o #25051

David Laban david.laban at collabora.co.uk
Wed Nov 18 07:35:05 PST 2009


Use tp_g_signal_connect_object to connect signal handlers with a
weakref to manager.
---
 telepathy-glib/account-manager.c |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/telepathy-glib/account-manager.c b/telepathy-glib/account-manager.c
index 439e3b0..10cf404 100644
--- a/telepathy-glib/account-manager.c
+++ b/telepathy-glib/account-manager.c
@@ -1005,14 +1005,17 @@ _tp_account_manager_account_ready_cb (GObject *source_object,
       g_object_unref (result);
     }
 
-  g_signal_connect (account, "notify::enabled",
-      G_CALLBACK (_tp_account_manager_account_enabled_cb), manager);
+  tp_g_signal_connect_object (account, "notify::enabled",
+      G_CALLBACK (_tp_account_manager_account_enabled_cb),
+      G_OBJECT (manager), 0);
 
-  g_signal_connect (account, "presence-changed",
-      G_CALLBACK (_tp_account_manager_account_presence_changed_cb), manager);
+  tp_g_signal_connect_object (account, "presence-changed",
+      G_CALLBACK (_tp_account_manager_account_presence_changed_cb),
+      G_OBJECT (manager), 0);
 
-  g_signal_connect (account, "invalidated",
-      G_CALLBACK (_tp_account_manager_account_invalidated_cb), manager);
+  tp_g_signal_connect_object (account, "invalidated",
+      G_CALLBACK (_tp_account_manager_account_invalidated_cb),
+      G_OBJECT (manager), 0);
 
   _tp_account_manager_check_core_ready (manager);
 }
-- 
1.5.6.5



More information about the telepathy-commits mailing list