Only cancel the name owner watch if the dbus proxy still exists

diff --git a/libempathy/empathy-account-manager.c b/libempathy/empathy-account-manager.c
index bc5d6e37d8a9806542e33d93a3283fdaabbcc9df..00c5cb14f03916112e281fdd1b5f27df5f76bf41 100644 (file)
--- 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;
     }