]> git.0d.be Git - empathy.git/commitdiff
CallWindow: use tp_g_signal_connect_object
authorEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Thu, 28 Jul 2011 09:17:10 +0000 (10:17 +0100)
committerEmilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Thu, 28 Jul 2011 09:17:10 +0000 (10:17 +0100)
So the signals are disconnected when the window is destroyed.

src/empathy-call-window.c

index 3bd6d746da17eb8c1ddfdf4cabccf6ed9a7d94e3..1c2f69933a3a94367fd299b1587fa60faba0ffba 100644 (file)
@@ -1291,13 +1291,12 @@ empathy_call_window_setup_avatars (EmpathyCallWindow *self,
 {
   EmpathyCallWindowPriv *priv = GET_PRIV (self);
 
-  g_signal_connect (priv->contact, "notify::name",
-      G_CALLBACK (contact_name_changed_cb), self);
-  g_signal_connect (priv->contact, "notify::avatar",
-    G_CALLBACK (contact_avatar_changed_cb), self);
-  /* FIXME: There's no EmpathyContact::presence yet */
-  g_signal_connect (priv->contact, "notify::presence",
-      G_CALLBACK (contact_presence_changed_cb), self);
+  tp_g_signal_connect_object (priv->contact, "notify::name",
+      G_CALLBACK (contact_name_changed_cb), self, 0);
+  tp_g_signal_connect_object (priv->contact, "notify::avatar",
+    G_CALLBACK (contact_avatar_changed_cb), self, 0);
+  tp_g_signal_connect_object (priv->contact, "notify::presence",
+      G_CALLBACK (contact_presence_changed_cb), self, 0);
 
   set_window_title (self);
   set_remote_user_name (self, priv->contact);