aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy/empathy-account-manager.c
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2009-08-17 20:19:25 +0800
committerSjoerd Simons <sjoerd.simons@collabora.co.uk>2009-08-17 20:19:25 +0800
commit0c3cd08bfeadc61d4f679e9f36732e49d6500418 (patch)
tree67a48ce791a1cce912736233450d2ecbf73d954c /libempathy/empathy-account-manager.c
parentaf5442e540b7913f382e7691053c91472b867254 (diff)
downloadgsoc2013-empathy-0c3cd08bfeadc61d4f679e9f36732e49d6500418.tar
gsoc2013-empathy-0c3cd08bfeadc61d4f679e9f36732e49d6500418.tar.gz
gsoc2013-empathy-0c3cd08bfeadc61d4f679e9f36732e49d6500418.tar.bz2
gsoc2013-empathy-0c3cd08bfeadc61d4f679e9f36732e49d6500418.tar.lz
gsoc2013-empathy-0c3cd08bfeadc61d4f679e9f36732e49d6500418.tar.xz
gsoc2013-empathy-0c3cd08bfeadc61d4f679e9f36732e49d6500418.tar.zst
gsoc2013-empathy-0c3cd08bfeadc61d4f679e9f36732e49d6500418.zip
Only cancel the name owner watch if the dbus proxy still exists
Diffstat (limited to 'libempathy/empathy-account-manager.c')
-rw-r--r--libempathy/empathy-account-manager.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libempathy/empathy-account-manager.c b/libempathy/empathy-account-manager.c
index bc5d6e37d..00c5cb14f 100644
--- a/libempathy/empathy-account-manager.c
+++ b/libempathy/empathy-account-manager.c
@@ -516,11 +516,12 @@ do_dispose (GObject *obj)
}
}
- tp_dbus_daemon_cancel_name_owner_watch (priv->dbus,
- TP_ACCOUNT_MANAGER_BUS_NAME, account_manager_name_owner_cb, manager);
if (priv->dbus != NULL)
{
+ tp_dbus_daemon_cancel_name_owner_watch (priv->dbus,
+ TP_ACCOUNT_MANAGER_BUS_NAME, account_manager_name_owner_cb, manager);
+
g_object_unref (priv->dbus);
priv->dbus = NULL;
}