[empathy/mc5: 383/483] Only cancel the name owner watch if the dbus proxy still exists

[Sjoerd Simons <sjoerds src gnome org>]

commit 0c3cd08bfeadc61d4f679e9f36732e49d6500418
Author: Sjoerd Simons <sjoerd simons collabora co uk>
Date:   Mon Aug 17 13:19:25 2009 +0100

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

 libempathy/empathy-account-manager.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/libempathy/empathy-account-manager.c b/libempathy/empathy-account-manager.c
index bc5d6e3..00c5cb1 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;
     }