[gnome-initial-setup] timezone: Stop geolocation if it hasn't finished in time

[Kalev Lember <klember src gnome org>]

commit eed2b204b597431d53b110c0c24f685a0d10e028
Author: Kalev Lember <kalevlember gmail com>
Date:   Tue Mar 18 21:46:45 2014 +0100

    timezone: Stop geolocation if it hasn't finished in time

 .../pages/timezone/gis-timezone-page.c             |   35 ++++++++++++++++----
 1 files changed, 28 insertions(+), 7 deletions(-)
---
diff --git a/gnome-initial-setup/pages/timezone/gis-timezone-page.c 
b/gnome-initial-setup/pages/timezone/gis-timezone-page.c
index 3e83213..19167e1 100644
--- a/gnome-initial-setup/pages/timezone/gis-timezone-page.c
+++ b/gnome-initial-setup/pages/timezone/gis-timezone-page.c
@@ -407,6 +407,31 @@ search_button_toggled (GtkToggleButton *button,
 }
 
 static void
+stop_geolocation (GisTimezonePage *page)
+{
+  GisTimezonePagePrivate *priv = gis_timezone_page_get_instance_private (page);
+
+  if (priv->geoclue_cancellable)
+    {
+      g_cancellable_cancel (priv->geoclue_cancellable);
+      g_clear_object (&priv->geoclue_cancellable);
+    }
+
+  g_clear_object (&priv->geoclue_client);
+  g_clear_object (&priv->geoclue_manager);
+}
+
+static void
+page_mapped (GtkWidget *widget,
+             gpointer   user_data)
+{
+  GisTimezonePage *page = user_data;
+
+  /* Stop timezone geolocation if it hasn't finished by the time we get here */
+  stop_geolocation (page);
+}
+
+static void
 gis_timezone_page_constructed (GObject *object)
 {
   GisTimezonePage *page = GIS_TIMEZONE_PAGE (object);
@@ -433,6 +458,8 @@ gis_timezone_page_constructed (GObject *object)
 
   g_signal_connect (priv->search_entry, "notify::location",
                     G_CALLBACK (entry_location_changed), page);
+  g_signal_connect (page, "map",
+                    G_CALLBACK (page_mapped), page);
   g_signal_connect (priv->search_entry, "map",
                     G_CALLBACK (entry_mapped), page);
   g_signal_connect (priv->stack, "notify::visible-child",
@@ -449,15 +476,9 @@ gis_timezone_page_dispose (GObject *object)
   GisTimezonePage *page = GIS_TIMEZONE_PAGE (object);
   GisTimezonePagePrivate *priv = gis_timezone_page_get_instance_private (page);
 
-  if (priv->geoclue_cancellable)
-    {
-      g_cancellable_cancel (priv->geoclue_cancellable);
-      g_clear_object (&priv->geoclue_cancellable);
-    }
+  stop_geolocation (page);
 
   g_clear_object (&priv->dtm);
-  g_clear_object (&priv->geoclue_client);
-  g_clear_object (&priv->geoclue_manager);
 
   G_OBJECT_CLASS (gis_timezone_page_parent_class)->dispose (object);
 }