Merge lp:~charlesk/indicator-datetime/13.10-lp-1271484 into lp:~indicator-applet-developers/indicator-datetime/trunk.13.10

[Charles Kerr]

Fix 13.10 regression that stopped listening to /etc/timezone changes if geoclue detection was disabled.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:283
http://jenkins.qa.ubuntu.com/job/indicator-datetime-13.10-ci/5/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-13.10-saucy-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-13.10-saucy-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/indicator-datetime-13.10-saucy-armhf-ci/5/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-datetime-13.10-ci/5/rebuild

review: Approve (continuous-integration)

[Ted Gould (ted)]

review: Approve

=== modified file 'src/service.c'
--- src/service.c	2013-11-03 05:09:01 +0000
+++ src/service.c	2014-01-28 01:04:42 +0000
@@ -862,15 +862,13 @@
 }
 
 /* When the 'auto-detect timezone' boolean setting changes,
-   start or stop watching geoclue and /etc/timezone */
+   start or stop watching geoclue */
 static void
-set_detect_location_enabled (IndicatorDatetimeService * self, gboolean enabled)
+set_geoclue_enabled (IndicatorDatetimeService * self, gboolean enabled)
 {
   gboolean changed = FALSE;
   priv_t * p = self->priv;
 
-  /* geoclue */
-
   if (!p->tz_geoclue && enabled)
     {
       p->tz_geoclue = indicator_datetime_timezone_geoclue_new ();
@@ -888,25 +886,6 @@
       changed = TRUE;
     }
 
-  /* timezone file */
-
-  if (!p->tz_file && enabled)
-    {
-      p->tz_file = indicator_datetime_timezone_file_new (TIMEZONE_FILE);
-      g_signal_connect_swapped (p->tz_file, "notify::timezone",
-                                G_CALLBACK(on_current_timezone_changed),
-                                self);
-      changed = TRUE;
-    }
-  else if (p->tz_file && !enabled)
-    {
-      g_signal_handlers_disconnect_by_func (p->tz_file,
-                                            on_current_timezone_changed,
-                                            self);
-      g_clear_object (&p->tz_file);
-      changed = TRUE;
-    }
-
   if (changed)
     on_current_timezone_changed (self);
 }
@@ -1000,8 +979,8 @@
   priv_t * p = self->priv;
   GDateTime * now = indicator_datetime_service_get_localtime (self);
 
-  set_detect_location_enabled (self,
-                               g_settings_get_boolean (p->settings, SETTINGS_SHOW_DETECTED_S));
+  set_geoclue_enabled (self,
+                       g_settings_get_boolean (p->settings, SETTINGS_SHOW_DETECTED_S));
 
   menu = g_menu_new ();
 
@@ -1821,7 +1800,13 @@
       g_clear_object (&p->cancellable);
     }
 
-  set_detect_location_enabled (self, FALSE);
+  if (p->tz_file != NULL)
+    {
+      g_signal_handlers_disconnect_by_func (p->tz_file, on_current_timezone_changed, o);
+      g_clear_object (&p->tz_file);
+    }
+
+  set_geoclue_enabled (self, FALSE);
 
   if (p->planner != NULL)
     {
@@ -2007,6 +1992,11 @@
                               self,
                               NULL);
 
+  p->tz_file = indicator_datetime_timezone_file_new (TIMEZONE_FILE);
+  g_signal_connect_swapped (p->tz_file, "notify::timezone",
+                            G_CALLBACK(on_current_timezone_changed),
+                            self);
+
   on_local_time_jumped (self);
 
   for (i=0; i<N_PROFILES; ++i)