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

[Charles Kerr]

cache our internal GTimeZone instead of constantly re-creating it.

[PS Jenkins bot (ps-jenkins)]

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

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/indicator-datetime-ci/112/rebuild

review: Approve (continuous-integration)

[Ted Gould (ted)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
Unapproved changes made after approval.
http://jenkins.qa.ubuntu.com/job/indicator-datetime-autolanding/48/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-saucy-amd64-autolanding/42
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-saucy-armhf-autolanding/42
        deb: http://jenkins.qa.ubuntu.com/job/indicator-datetime-saucy-armhf-autolanding/42/artifact/work/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/indicator-datetime-ci/113/rebuild

review: Approve (continuous-integration)

=== modified file 'src/service.c'
--- src/service.c	2013-10-04 19:45:28 +0000
+++ src/service.c	2013-10-15 14:30:40 +0000
@@ -94,6 +94,9 @@
   IndicatorDatetimeTimezone * tz_geoclue;
   IndicatorDatetimePlanner * planner;
 
+  /* cached GTimeZone for use by indicator_datetime_service_get_localtime() */
+  GTimeZone * internal_timezone;
+
   guint own_id;
   guint actions_export_id;
   GDBusConnection * conn;
@@ -376,6 +379,23 @@
   g_date_time_unref (now);
 }
 
+static void
+update_internal_timezone (IndicatorDatetimeService * self)
+{
+  priv_t * p = self->priv;
+  const char * id;
+
+  /* find the id from tz_file or tz_geoclue if possible; NULL otherwise */
+  id = NULL;
+  if (!id && p->tz_file)
+    id = indicator_datetime_timezone_get_timezone (p->tz_file);
+  if (!id && p->tz_geoclue)
+    id = indicator_datetime_timezone_get_timezone (p->tz_geoclue);
+
+  g_clear_pointer (&p->internal_timezone, g_time_zone_unref);
+  p->internal_timezone = g_time_zone_new (id);
+}
+
 /**
  * General purpose handler for rebuilding sections and restarting their timers
  * when time jumps for whatever reason:
@@ -394,6 +414,7 @@
      1. rebuild the necessary states / menuitems when time jumps
      2. restart the timers so their new wait interval is correct */
 
+  update_internal_timezone (self);
   on_header_timer (self);
   on_timezone_timer (self);
 }
@@ -1794,6 +1815,7 @@
   for (i=0; i<N_PROFILES; ++i)
     g_clear_object (&p->menus[i].menu);
 
+  g_clear_pointer (&p->internal_timezone, g_time_zone_unref);
   g_clear_object (&p->calendar_action);
   g_clear_object (&p->desktop_header_action);
   g_clear_object (&p->phone_header_action);
@@ -1989,9 +2011,14 @@
 /* This currently just returns the system time,
    As we add test coverage, we'll need this to bypass the system time. */
 GDateTime *
-indicator_datetime_service_get_localtime (IndicatorDatetimeService * self G_GNUC_UNUSED)
+indicator_datetime_service_get_localtime (IndicatorDatetimeService * self)
 {
-  return g_date_time_new_now_local ();
+  priv_t * p = self->priv;
+
+  if (G_UNLIKELY (p->internal_timezone == NULL))
+    update_internal_timezone (self);
+
+  return g_date_time_new_now (p->internal_timezone);
 }
 
 void