[gnome-initial-setup] account: Make sure realmd watch is cancelled

[Michael Wood <mwood src gnome org>]

commit 321fe0f29993e0fefd833733dd5b61d372aa5d9c
Author: Michael Wood <michael g wood intel com>
Date:   Fri Jun 7 17:27:35 2013 +0100

    account: Make sure realmd watch is cancelled
    
    In the case where we're changing languages realm_manager may be null but
    a valid watch is setup.

 .../pages/account/gis-account-page.c               |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/gnome-initial-setup/pages/account/gis-account-page.c 
b/gnome-initial-setup/pages/account/gis-account-page.c
index f601dd1..bb6ca2e 100644
--- a/gnome-initial-setup/pages/account/gis-account-page.c
+++ b/gnome-initial-setup/pages/account/gis-account-page.c
@@ -1239,9 +1239,13 @@ gis_account_page_dispose (GObject *object)
 {
   GisAccountPage *page = GIS_ACCOUNT_PAGE (object);
   GisAccountPagePrivate *priv = page->priv;
-
-  if (priv->realm_manager && priv->realmd_watch)
+  if (priv->realmd_watch)
     g_bus_unwatch_name (priv->realmd_watch);
+
+  priv->realmd_watch = 0;
+
+  g_cancellable_cancel (priv->cancellable);
+
   g_clear_object (&priv->realm_manager);
   g_clear_object (&priv->action);
   g_clear_object (&priv->realm);