aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy
diff options
context:
space:
mode:
authorxclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4>2008-02-26 21:31:28 +0800
committerxclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4>2008-02-26 21:31:28 +0800
commit2558e615e76a3b324e6148c32a211d35f57ef10f (patch)
tree722b52c27724589d46270666e13da7ad624a6b44 /libempathy
parenta1535b6be42b5dcb72c3d7c7cdedf5f31dee038c (diff)
downloadgsoc2013-empathy-2558e615e76a3b324e6148c32a211d35f57ef10f.tar
gsoc2013-empathy-2558e615e76a3b324e6148c32a211d35f57ef10f.tar.gz
gsoc2013-empathy-2558e615e76a3b324e6148c32a211d35f57ef10f.tar.bz2
gsoc2013-empathy-2558e615e76a3b324e6148c32a211d35f57ef10f.tar.lz
gsoc2013-empathy-2558e615e76a3b324e6148c32a211d35f57ef10f.tar.xz
gsoc2013-empathy-2558e615e76a3b324e6148c32a211d35f57ef10f.tar.zst
gsoc2013-empathy-2558e615e76a3b324e6148c32a211d35f57ef10f.zip
Cancel name owner watch when the call is finalized
git-svn-id: svn+ssh://svn.gnome.org/svn/empathy/trunk@672 4ee84921-47dd-4033-b63a-18d7a039a3e4
Diffstat (limited to 'libempathy')
-rw-r--r--libempathy/empathy-tp-call.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/libempathy/empathy-tp-call.c b/libempathy/empathy-tp-call.c
index f92aef492..d94c78f1f 100644
--- 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);
}