Cancel name owner watch when the call is finalized

svn path=/trunk/; revision=672

diff --git a/libempathy/empathy-tp-call.c b/libempathy/empathy-tp-call.c
index f92aef4925c2c7e41a9dc2def6e154418bff70a6..d94c78f1f9427519506a1740f1b81e264d735488 100644 (file)
--- a/libempathy/empathy-tp-call.c
+++ b/libempathy/empathy-tp-call.c
@@ -537,6 +537,7 @@ tp_call_start_stream_engine (EmpathyTpCall *call)
       G_CALLBACK (tp_call_invalidated_cb),
       call);
   
+  /* FIXME: dbus daemon should be unique */
   priv->dbus_daemon = tp_dbus_daemon_new (tp_get_bus ());
   tp_dbus_daemon_watch_name_owner (priv->dbus_daemon, STREAM_ENGINE_BUS_NAME,
       tp_call_watch_name_owner_cb,
@@ -631,7 +632,13 @@ tp_call_finalize (GObject *object)
       g_object_unref (priv->contact);
 
   if (priv->dbus_daemon != NULL)
+    {
+      tp_dbus_daemon_cancel_name_owner_watch (priv->dbus_daemon,
+          STREAM_ENGINE_BUS_NAME,
+          tp_call_watch_name_owner_cb,
+          object);
       g_object_unref (priv->dbus_daemon);
+    }
 
   (G_OBJECT_CLASS (empathy_tp_call_parent_class)->finalize) (object);
 }