Merge lp:~charlesk/indicator-datetime/make-timezones-and-clock-mockable into lp:indicator-datetime/14.04

[Charles Kerr]

Make timezone detection and localtime mockable.

This is step 1 of work to increase test coverage in indicator-datetime for bug #1237509. This step decouples some datetime's code to make unit tests possible, step 2 switches the build system to cmake, and step 3 adds the tests.

Changes in this MP:

1. Make an IndicatorDatetimeClock interface that provides localtime and timezone information to its users.

2. IndicatorDatetimeService now takes a clock in its constructor rather than instantiating one internally. This way we can pass it a live clock in production or a fake one in testing.

3. In main(), instantiate a live clock and pass it to the service

4. In main(), remove the last-minute appointment/alarm testing hacks that were added for 13.10. Move IndicatorDatetimePlannerMock to the tests/ subdirectory for future use by "make check"

5. Cache a couple of variables in IndicatorDatetimeClock and IndicatorDatetimeService: the const strv of timezones returned by indicator_datetime_clock_get_timezones(), the time format string used by the desktop header's action state, some GVariants used by the service when building action states.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Ted Gould (ted)]

Don't see anything. Realize this is a MR-series in progress so I won't comment on the lack of tests :-)

One little thing:

1226 + properties[PROP_CLOCK] = g_param_spec_object ("clock",
1227 + "Clock",
1228 + "The clock",
1229 + G_TYPE_OBJECT,
1230 + flags);

Should probably be INDICATOR_TYPE_DATETIME_CLOCK instead of G_TYPE_OBJECT, no reason to not be more specific.

review: Approve

[Charles Kerr (charlesk)]

You can't make a g_param_spec for an interface because the object won't know how to memory manage it. So you require it to be a GObject that implements the interface s.t. IndicatorDatetimeService can use g_object_ref / g_object_unref().

[Charles Kerr (charlesk)]

Actually, you're right. That's possible once the G_TYPE_INDICATOR_DATETIME has specified GObject as a prerequisite.

Fixed r286

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/indicator-datetime-autolanding/56/
Executed test runs:
    FAILURE: http://10.97.0.26:8080/job/generic-cleanup-mbs/2929/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-datetime-trusty-amd64-autolanding/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-datetime-trusty-armhf-autolanding/1/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:286
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/121/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-datetime-trusty-amd64-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-datetime-trusty-armhf-ci/1/console

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

review: Needs Fixing (continuous-integration)

[lp:~charlesk/indicator-datetime/make-timezones-and-clock-mockable]

287. By Charles Kerr on 2013-10-23

instead of keeping IndicatorDatetimeTimezone objects in separate fields, keep them in a list so they can be handled in a loop.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:287
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/122/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-trusty-amd64-ci/2
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-datetime-trusty-armhf-ci/2/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:287
http://jenkins.qa.ubuntu.com/job/indicator-datetime-ci/123/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-trusty-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-datetime-trusty-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/indicator-datetime-trusty-armhf-ci/3/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2013-10-10 02:31:13 +0000
+++ src/Makefile.am	2013-10-23 18:14:52 +0000
@@ -18,10 +18,12 @@
   $(SHARED_CFLAGS)
 
 libindicator_datetime_service_a_SOURCES = \
+  clock.c \
+  clock.h \
+  clock-live.c \
+  clock-live.h \
   planner.c \
   planner.h \
-  planner-mock.c \
-  planner-mock.h \
   planner-eds.c \
   planner-eds.h \
   service.c \

=== added file 'src/clock-live.c'
--- src/clock-live.c	1970-01-01 00:00:00 +0000
+++ src/clock-live.c	2013-10-23 18:14:52 +0000
@@ -0,0 +1,281 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * Authors:
+ *   Charles Kerr <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <glib.h>
+#include <gio/gio.h>
+
+#include "config.h"
+
+#include "clock-live.h"
+#include "settings-shared.h"
+#include "timezone-file.h"
+#include "timezone-geoclue.h"
+
+/***
+****  private struct
+***/
+
+struct _IndicatorDatetimeClockLivePriv
+{
+  GSettings * settings;
+
+  GSList * timezones; /* IndicatorDatetimeTimezone */
+  gchar ** timezones_strv;
+  GTimeZone * localtime_zone;
+};
+
+typedef IndicatorDatetimeClockLivePriv priv_t;
+
+/***
+****  GObject boilerplate
+***/
+
+static void indicator_datetime_clock_interface_init (
+                                IndicatorDatetimeClockInterface * iface);
+
+G_DEFINE_TYPE_WITH_CODE (
+  IndicatorDatetimeClockLive,
+  indicator_datetime_clock_live,
+  G_TYPE_OBJECT,
+  G_IMPLEMENT_INTERFACE (INDICATOR_TYPE_DATETIME_CLOCK,
+                         indicator_datetime_clock_interface_init));
+
+/***
+****  Timezones
+***/
+
+static void
+on_current_timezone_changed (IndicatorDatetimeClockLive * self)
+{
+  priv_t * p = self->priv;
+
+  /* Invalidate the timezone information.
+     These fields will be lazily regenerated by rebuild_timezones() */
+  g_clear_pointer (&p->timezones_strv, g_strfreev);
+  g_clear_pointer (&p->localtime_zone, g_time_zone_unref);
+
+  indicator_datetime_clock_emit_changed (INDICATOR_DATETIME_CLOCK (self));
+}
+
+static void
+set_detect_location_enabled (IndicatorDatetimeClockLive * self, gboolean enabled)
+{
+  GSList * l;
+  priv_t * p = self->priv;
+  gboolean changed = FALSE;
+
+  /* clear out the old timezone objects */
+  if (p->timezones != NULL)
+    {
+      for (l=p->timezones; l!=NULL; l=l->next)
+        {
+          g_signal_handlers_disconnect_by_func (l->data, on_current_timezone_changed, self);
+          g_object_unref (l->data);
+        }
+
+      g_slist_free (p->timezones);
+      p->timezones = NULL;
+      changed = TRUE;
+    }
+
+  /* maybe add new timezone objects */
+  if (enabled)
+    {
+      p->timezones = g_slist_append (p->timezones, indicator_datetime_timezone_geoclue_new ());
+      p->timezones = g_slist_append (p->timezones, indicator_datetime_timezone_file_new (TIMEZONE_FILE));
+
+      for (l=p->timezones; l!=NULL; l=l->next)
+        {
+          g_signal_connect_swapped (l->data, "notify::timezone",
+                                    G_CALLBACK(on_current_timezone_changed), self);
+        }
+
+      changed = TRUE;
+    }
+
+  if (changed)
+    on_current_timezone_changed (self);
+}
+
+/* When the 'auto-detect timezone' boolean setting changes,
+   start or stop watching geoclue and /etc/timezone */
+static void
+on_detect_location_changed (IndicatorDatetimeClockLive * self)
+{
+  const gboolean enabled = g_settings_get_boolean (self->priv->settings, SETTINGS_SHOW_DETECTED_S);
+  set_detect_location_enabled (self, enabled);
+}
+
+/***
+****  IndicatorDatetimeClock virtual functions
+***/
+
+static void
+rebuild_timezones (IndicatorDatetimeClockLive * self)
+{
+  priv_t * p;
+  GHashTable * hash;
+  GSList * l;
+  int i;
+  GHashTableIter iter;
+  gpointer key;
+
+  p = self->priv;
+
+  /* Build a hashtable of timezone strings.
+     This will weed out duplicates. */
+  hash = g_hash_table_new (g_str_hash, g_str_equal);
+  for (l=p->timezones; l!=NULL; l=l->next)
+    {
+      const gchar * tz = indicator_datetime_timezone_get_timezone (l->data);
+      if (tz && *tz)
+        g_hash_table_add (hash, (gpointer) tz);
+    }
+
+  /* rebuild p->timezone_strv */
+  g_strfreev (p->timezones_strv);
+  p->timezones_strv = g_new0 (gchar*, g_hash_table_size(hash) + 1);
+  i = 0;
+  g_hash_table_iter_init (&iter, hash);
+  while (g_hash_table_iter_next (&iter, &key, NULL))
+    p->timezones_strv[i++] = g_strdup (key);
+
+  /* rebuild localtime_zone */
+  g_clear_pointer (&p->localtime_zone, g_time_zone_unref);
+  p->localtime_zone = g_time_zone_new (p->timezones_strv ? p->timezones_strv[0] : NULL);
+
+  /* cleanup */
+  g_hash_table_unref (hash);
+}
+
+static const gchar **
+my_get_timezones (IndicatorDatetimeClock * clock)
+{
+  IndicatorDatetimeClockLive * self = INDICATOR_DATETIME_CLOCK_LIVE (clock);
+  priv_t * p = self->priv;
+
+  if (G_UNLIKELY (p->timezones_strv == NULL))
+    rebuild_timezones (self);
+
+  return (const gchar **) p->timezones_strv;
+}
+
+static GDateTime *
+my_get_localtime (IndicatorDatetimeClock * clock)
+{
+  IndicatorDatetimeClockLive * self = INDICATOR_DATETIME_CLOCK_LIVE (clock);
+  priv_t * p = self->priv;
+
+  if (G_UNLIKELY (p->localtime_zone == NULL))
+    rebuild_timezones (self);
+
+  return g_date_time_new_now (p->localtime_zone);
+}
+
+/***
+****  GObject virtual functions
+***/
+
+static void
+my_dispose (GObject * o)
+{
+  IndicatorDatetimeClockLive * self;
+  priv_t * p;
+
+  self = INDICATOR_DATETIME_CLOCK_LIVE(o);
+  p = self->priv;
+
+  if (p->settings != NULL)
+    {
+      g_signal_handlers_disconnect_by_data (p->settings, self);
+      g_clear_object (&p->settings);
+    }
+
+  set_detect_location_enabled (self, FALSE);
+
+  G_OBJECT_CLASS (indicator_datetime_clock_live_parent_class)->dispose (o);
+}
+
+static void
+my_finalize (GObject * o)
+{
+  IndicatorDatetimeClockLive * self;
+  priv_t * p;
+
+  self = INDICATOR_DATETIME_CLOCK_LIVE(o);
+  p = self->priv;
+
+  g_clear_pointer (&p->localtime_zone, g_time_zone_unref);
+  g_strfreev (p->timezones_strv);
+
+  G_OBJECT_CLASS (indicator_datetime_clock_live_parent_class)->dispose (o);
+}
+
+/***
+****  Instantiation
+***/
+
+static void
+indicator_datetime_clock_live_class_init (IndicatorDatetimeClockLiveClass * klass)
+{
+  GObjectClass * object_class = G_OBJECT_CLASS (klass);
+
+  object_class->dispose = my_dispose;
+  object_class->finalize = my_finalize;
+
+  g_type_class_add_private (klass,
+                            sizeof (IndicatorDatetimeClockLivePriv));
+}
+
+static void
+indicator_datetime_clock_interface_init (IndicatorDatetimeClockInterface * iface)
+{
+  iface->get_localtime = my_get_localtime;
+  iface->get_timezones = my_get_timezones;
+}
+
+static void
+indicator_datetime_clock_live_init (IndicatorDatetimeClockLive * self)
+{
+  IndicatorDatetimeClockLivePriv * p;
+
+  p = G_TYPE_INSTANCE_GET_PRIVATE (self,
+                                   INDICATOR_TYPE_DATETIME_CLOCK_LIVE,
+                                   IndicatorDatetimeClockLivePriv);
+  self->priv = p;
+
+  p->settings = g_settings_new (SETTINGS_INTERFACE);
+  g_signal_connect (p->settings, "changed::" SETTINGS_SHOW_DETECTED_S,
+                    G_CALLBACK(on_detect_location_changed), self);
+
+
+  on_detect_location_changed (self);
+}
+
+/***
+****  Public API
+***/
+
+IndicatorDatetimeClock *
+indicator_datetime_clock_live_new (void)
+{
+  gpointer o = g_object_new (INDICATOR_TYPE_DATETIME_CLOCK_LIVE, NULL);
+
+  return INDICATOR_DATETIME_CLOCK (o);
+}

=== added file 'src/clock-live.h'
--- src/clock-live.h	1970-01-01 00:00:00 +0000
+++ src/clock-live.h	2013-10-23 18:14:52 +0000
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * Authors:
+ *   Charles Kerr <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __INDICATOR_DATETIME_CLOCK_LIVE__H__
+#define __INDICATOR_DATETIME_CLOCK_LIVE__H__
+
+#include <glib-object.h> /* parent class */
+
+#include "clock.h"
+
+G_BEGIN_DECLS
+
+#define INDICATOR_TYPE_DATETIME_CLOCK_LIVE \
+  (indicator_datetime_clock_live_get_type())
+
+#define INDICATOR_DATETIME_CLOCK_LIVE(o) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((o), \
+                               INDICATOR_TYPE_DATETIME_CLOCK_LIVE, \
+                               IndicatorDatetimeClockLive))
+
+#define INDICATOR_DATETIME_CLOCK_LIVE_GET_CLASS(o) \
+ (G_TYPE_INSTANCE_GET_CLASS ((o), \
+                             INDICATOR_TYPE_DATETIME_CLOCK_LIVE, \
+                             IndicatorDatetimeClockLiveClass))
+
+#define INDICATOR_IS_DATETIME_CLOCK_LIVE(o) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((o), \
+                               INDICATOR_TYPE_DATETIME_CLOCK_LIVE))
+
+typedef struct _IndicatorDatetimeClockLive
+                IndicatorDatetimeClockLive;
+typedef struct _IndicatorDatetimeClockLivePriv
+                IndicatorDatetimeClockLivePriv;
+typedef struct _IndicatorDatetimeClockLiveClass
+                IndicatorDatetimeClockLiveClass;
+
+/**
+ * An IndicatorDatetimeClock which gives live clock times
+ * from timezones determined by geoclue and /etc/timezone
+ */
+struct _IndicatorDatetimeClockLive
+{
+  GObject parent_instance;
+
+  IndicatorDatetimeClockLivePriv * priv;
+};
+
+struct _IndicatorDatetimeClockLiveClass
+{
+  GObjectClass parent_class;
+};
+
+IndicatorDatetimeClock * indicator_datetime_clock_live_new (void);
+
+G_END_DECLS
+
+#endif /* __INDICATOR_DATETIME_CLOCK_LIVE__H__ */

=== added file 'src/clock.c'
--- src/clock.c	1970-01-01 00:00:00 +0000
+++ src/clock.c	2013-10-23 18:14:52 +0000
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * Authors:
+ *   Charles Kerr <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "clock.h"
+
+enum
+{
+  SIGNAL_CHANGED,
+  SIGNAL_LAST
+};
+
+static guint signals[SIGNAL_LAST] = { 0 };
+
+G_DEFINE_INTERFACE (IndicatorDatetimeClock,
+                    indicator_datetime_clock,
+                    G_TYPE_OBJECT);
+
+static void
+indicator_datetime_clock_default_init (IndicatorDatetimeClockInterface * klass)
+{
+  signals[SIGNAL_CHANGED] = g_signal_new (
+      "changed",
+      G_TYPE_FROM_CLASS(klass),
+      G_SIGNAL_RUN_LAST,
+      G_STRUCT_OFFSET (IndicatorDatetimeClockInterface, changed),
+      NULL, NULL,
+      g_cclosure_marshal_VOID__VOID,
+      G_TYPE_NONE, 0);
+}
+
+/***
+****  PUBLIC API
+***/
+
+/**
+ * Get a strv of timezones.
+ *
+ * Return value: (element-type char*)
+ *               (transfer full):
+ *               array of timezone strings
+ */
+const gchar **
+indicator_datetime_clock_get_timezones (IndicatorDatetimeClock * self)
+{
+  const gchar ** timezones;
+  IndicatorDatetimeClockInterface * iface;
+
+  g_return_val_if_fail (INDICATOR_IS_DATETIME_CLOCK(self), NULL);
+  iface = INDICATOR_DATETIME_CLOCK_GET_INTERFACE(self);
+
+  if (iface->get_timezones != NULL)
+    timezones = iface->get_timezones (self);
+  else
+    timezones = NULL;
+
+  return timezones;
+}
+
+/**
+ * Get the current time.
+ *
+ * Return value: (element-type GDateTime*)
+ *               (transfer full):
+ *               the current time.
+ */
+GDateTime *
+indicator_datetime_clock_get_localtime (IndicatorDatetimeClock * self)
+{
+  GDateTime * now;
+  IndicatorDatetimeClockInterface * iface;
+
+  g_return_val_if_fail (INDICATOR_IS_DATETIME_CLOCK(self), NULL);
+  iface = INDICATOR_DATETIME_CLOCK_GET_INTERFACE(self);
+
+  if (iface->get_localtime != NULL)
+    now = iface->get_localtime (self);
+  else
+    now = NULL;
+
+  return now;
+}
+
+/**
+ * Emits the "changed" signal.
+ *
+ * This should only be called by subclasses.
+ */
+void
+indicator_datetime_clock_emit_changed (IndicatorDatetimeClock * self)
+{
+  g_return_if_fail (INDICATOR_IS_DATETIME_CLOCK (self));
+
+  g_signal_emit (self, signals[SIGNAL_CHANGED], 0, NULL);
+}

=== added file 'src/clock.h'
--- src/clock.h	1970-01-01 00:00:00 +0000
+++ src/clock.h	2013-10-23 18:14:52 +0000
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * Authors:
+ *   Charles Kerr <[e-mail]>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __INDICATOR_DATETIME_CLOCK__H__
+#define __INDICATOR_DATETIME_CLOCK__H__
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define INDICATOR_TYPE_DATETIME_CLOCK \
+  (indicator_datetime_clock_get_type ())
+
+#define INDICATOR_DATETIME_CLOCK(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+                               INDICATOR_TYPE_DATETIME_CLOCK, \
+                               IndicatorDatetimeClock))
+
+#define INDICATOR_IS_DATETIME_CLOCK(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), INDICATOR_TYPE_DATETIME_CLOCK))
+
+#define INDICATOR_DATETIME_CLOCK_GET_INTERFACE(inst) \
+  (G_TYPE_INSTANCE_GET_INTERFACE ((inst), \
+                                  INDICATOR_TYPE_DATETIME_CLOCK, \
+                                  IndicatorDatetimeClockInterface))
+
+typedef struct _IndicatorDatetimeClock
+                IndicatorDatetimeClock;
+
+typedef struct _IndicatorDatetimeClockInterface
+                IndicatorDatetimeClockInterface;
+
+struct _IndicatorDatetimeClockInterface
+{
+  GTypeInterface parent_iface;
+
+  /* signals */
+  void (*changed) (IndicatorDatetimeClock * self);
+
+  /* virtual functions */
+  const gchar** (*get_timezones) (IndicatorDatetimeClock * self);
+  GDateTime* (*get_localtime) (IndicatorDatetimeClock * self);
+};
+
+GType indicator_datetime_clock_get_type (void);
+
+/***
+****
+***/
+
+const gchar ** indicator_datetime_clock_get_timezones    (IndicatorDatetimeClock * clock);
+
+GDateTime    * indicator_datetime_clock_get_localtime    (IndicatorDatetimeClock * clock);
+
+void           indicator_datetime_clock_emit_changed     (IndicatorDatetimeClock * clock);
+
+
+G_END_DECLS
+
+#endif /* __INDICATOR_DATETIME_CLOCK__H__ */

=== modified file 'src/main.c'
--- src/main.c	2013-10-16 22:14:11 +0000
+++ src/main.c	2013-10-23 18:14:52 +0000
@@ -26,36 +26,26 @@
 #include <gio/gio.h>
 #include <libnotify/notify.h> 
 
+#include "clock-live.h"
 #include "planner-eds.h"
-#include "planner-mock.h"
 #include "service.h"
 
 /***
 ****
 ***/
 
-/* When enabled, new alarms will show up every minute to test snap decisions */
-static gboolean test_alarms = FALSE;
-
-static GOptionEntry entries[] = {
-  { "test-alarms", '\0', 0, G_OPTION_ARG_NONE, &test_alarms, "Test Alarms", NULL },
-  { NULL }
-};
-
 static void
 on_name_lost (gpointer instance G_GNUC_UNUSED, gpointer loop)
 {
   g_message ("exiting: service couldn't acquire or lost ownership of busname");
 
-  if (!test_alarms)
-    g_main_loop_quit ((GMainLoop*)loop);
+  g_main_loop_quit ((GMainLoop*)loop);
 }
 
 int
 main (int argc G_GNUC_UNUSED, char ** argv G_GNUC_UNUSED)
 {
-  GOptionContext * context;
-  GError * error;
+  IndicatorDatetimeClock * clock;
   IndicatorDatetimePlanner * planner;
   IndicatorDatetimeService * service;
   GMainLoop * loop;
@@ -69,36 +59,21 @@
   if (!notify_init ("indicator-datetime-service"))
     g_critical ("libnotify initialization failed");
 
-  /* parse command-line options */
-  context = g_option_context_new (NULL);
-  g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
-  if (!g_option_context_parse (context, &argc, &argv, &error))
-    {
-      g_print("option parsing failed: %s\n", error->message);
-      return EXIT_FAILURE;
-    }
-
-  /* set up the planner */
-  if (test_alarms)
-    {
-      g_message ("Using fake appointment book for testing alarms.");
-      planner = indicator_datetime_planner_mock_new ();
-    }
-  else
-    {
-      planner = indicator_datetime_planner_eds_new ();
-    }
+  /* create the service */
+  clock = indicator_datetime_clock_live_new ();
+  planner = indicator_datetime_planner_eds_new ();
+  service = indicator_datetime_service_new (clock, planner);
 
   /* run */
-  service = indicator_datetime_service_new (planner);
   loop = g_main_loop_new (NULL, FALSE);
   g_signal_connect (service, INDICATOR_DATETIME_SERVICE_SIGNAL_NAME_LOST,
                     G_CALLBACK(on_name_lost), loop);
   g_main_loop_run (loop);
+  g_main_loop_unref (loop);
 
   /* cleanup */
-  g_main_loop_unref (loop);
   g_object_unref (service);
   g_object_unref (planner);
+  g_object_unref (clock);
   return 0;
 }

=== modified file 'src/service.c'
--- src/service.c	2013-10-17 03:39:12 +0000
+++ src/service.c	2013-10-23 18:14:52 +0000
@@ -29,8 +29,6 @@
 #include <url-dispatcher.h>
 
 #include "dbus-shared.h"
-#include "timezone-file.h"
-#include "timezone-geoclue.h"
 #include "service.h"
 #include "settings-shared.h"
 #include "utils.h"
@@ -54,6 +52,7 @@
 enum
 {
   PROP_0,
+  PROP_CLOCK,
   PROP_PLANNER,
   PROP_LAST
 };
@@ -101,16 +100,14 @@
 
   GSettings * settings;
 
-  IndicatorDatetimeTimezone * tz_file;
-  IndicatorDatetimeTimezone * tz_geoclue;
+  IndicatorDatetimeClock * clock;
   IndicatorDatetimePlanner * planner;
 
-  /* cached GTimeZone for use by indicator_datetime_service_get_localtime() */
-  GTimeZone * internal_timezone;
-
   /* the clock app's icon filename */
   gchar * clock_app_icon_filename;
 
+  gchar * header_label_format_string;
+
   /* Whether or not we've tried to load the clock app's icon.
      This way we don't keep trying to reload it on the desktop */
   gboolean clock_app_icon_initialized;
@@ -150,6 +147,13 @@
   /* appointments over the next few weeks.
      Used when building SECTION_APPOINTMENTS */
   GSList * upcoming_appointments;
+
+  /* variant cache */
+  GVariant * desktop_title_variant;
+  GVariant * phone_title_variant;
+  GVariant * visible_true_variant;
+  GVariant * visible_false_variant;
+  GVariant * alarm_icon_variant;
 };
 
 typedef IndicatorDatetimeServicePrivate priv_t;
@@ -168,6 +172,12 @@
     }
 }
 
+static inline GDateTime *
+indicator_datetime_service_get_localtime (IndicatorDatetimeService * self)
+{
+  return indicator_datetime_clock_get_localtime (self->priv->clock);
+}
+
 /***
 ****
 ***/
@@ -178,6 +188,8 @@
 static inline void
 rebuild_header_soon (IndicatorDatetimeService * self)
 {
+  g_clear_pointer (&self->priv->header_label_format_string, g_free);
+
   rebuild_soon (self, SECTION_HEADER);
 }
 
@@ -360,7 +372,7 @@
   return G_SOURCE_REMOVE;
 }
 
-static char * get_header_label_format_string (IndicatorDatetimeService *);
+static const char * get_header_label_format_string (IndicatorDatetimeService *);
 
 static void
 start_header_timer (IndicatorDatetimeService * self)
@@ -374,11 +386,10 @@
 
   if (g_settings_get_boolean (self->priv->settings, SETTINGS_SHOW_CLOCK_S))
     {
-      char * fmt = get_header_label_format_string (self);
+      const char * fmt = get_header_label_format_string (self);
       header_shows_seconds = fmt && (strstr(fmt,"%s") || strstr(fmt,"%S") ||
                                      strstr(fmt,"%T") || strstr(fmt,"%X") ||
                                      strstr(fmt,"%c"));
-      g_free (fmt);
     }
 
   if (header_shows_seconds)
@@ -589,23 +600,6 @@
 ****
 ***/
 
-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:
@@ -624,7 +618,6 @@
      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);
 }
@@ -656,38 +649,46 @@
 ****
 ***/
 
-static gchar *
+static const gchar *
 get_header_label_format_string (IndicatorDatetimeService * self)
 {
-  char * fmt;
-  GSettings * s = self->priv->settings;
-  const TimeFormatMode mode = g_settings_get_enum (s, SETTINGS_TIME_FORMAT_S);
-
-  if (mode == TIME_FORMAT_MODE_CUSTOM)
-    {
-      fmt = g_settings_get_string (s, SETTINGS_CUSTOM_TIME_FORMAT_S);
-    }
-  else
-    {
-      gboolean show_day = g_settings_get_boolean (s, SETTINGS_SHOW_DAY_S);
-      gboolean show_date = g_settings_get_boolean (s, SETTINGS_SHOW_DATE_S);
-      fmt = generate_full_format_string (show_day, show_date, s);
-    }
-
-  return fmt;
+  priv_t * p = self->priv;
+
+  if (p->header_label_format_string == NULL)
+    {
+      char * fmt;
+      GSettings * s = p->settings;
+      const TimeFormatMode mode = g_settings_get_enum (s, SETTINGS_TIME_FORMAT_S);
+
+      if (mode == TIME_FORMAT_MODE_CUSTOM)
+        {
+          fmt = g_settings_get_string (s, SETTINGS_CUSTOM_TIME_FORMAT_S);
+        }
+      else
+        {
+          gboolean show_day = g_settings_get_boolean (s, SETTINGS_SHOW_DAY_S);
+          gboolean show_date = g_settings_get_boolean (s, SETTINGS_SHOW_DATE_S);
+          fmt = generate_full_format_string (show_day, show_date, s);
+        }
+
+      p->header_label_format_string = fmt;
+    }
+
+  return p->header_label_format_string;
 }
 
 static GVariant *
 create_desktop_header_state (IndicatorDatetimeService * self)
 {
+  priv_t * p = self->priv;
   GVariantBuilder b;
-  gchar * fmt;
+  const gchar * fmt;
   gchar * str;
   gboolean visible;
   GDateTime * now;
-  const gchar * title = _("Date and Time");
+  GVariant * label_variant;
 
-  visible = g_settings_get_boolean (self->priv->settings, SETTINGS_SHOW_CLOCK_S);
+  visible = g_settings_get_boolean (p->settings, SETTINGS_SHOW_CLOCK_S);
 
   /* build the time string for the label & a11y */
   fmt = get_header_label_format_string (self);
@@ -699,15 +700,15 @@
       g_warning ("%s", str);
     }
 
+  label_variant = g_variant_new_take_string (str);
   g_variant_builder_init (&b, G_VARIANT_TYPE_VARDICT);
-  g_variant_builder_add (&b, "{sv}", "accessible-desc", g_variant_new_string (str));
-  g_variant_builder_add (&b, "{sv}", "label", g_variant_new_take_string (str));
-  g_variant_builder_add (&b, "{sv}", "title", g_variant_new_string (title));
-  g_variant_builder_add (&b, "{sv}", "visible", g_variant_new_boolean (visible));
+  g_variant_builder_add (&b, "{sv}", "accessible-desc", label_variant);
+  g_variant_builder_add (&b, "{sv}", "label", label_variant);
+  g_variant_builder_add_value (&b, p->desktop_title_variant);
+  g_variant_builder_add_value (&b, visible ? p->visible_true_variant : p->visible_false_variant);
 
   /* cleanup */
   g_date_time_unref (now);
-  g_free (fmt);
   return g_variant_builder_end (&b);
 }
 
@@ -717,43 +718,37 @@
 static GVariant *
 create_phone_header_state (IndicatorDatetimeService * self)
 {
+  priv_t * p = self->priv;
+  const gboolean has_alarms = service_has_alarms (self);
   GVariantBuilder b;
   GDateTime * now;
   const gchar * fmt;
-  gchar * label;
-  gboolean has_alarms;
-  gchar * a11y;
-  const gchar * title = _("Upcoming");
 
   g_variant_builder_init (&b, G_VARIANT_TYPE_VARDICT);
-
-  /* label */
+  g_variant_builder_add_value (&b, p->phone_title_variant);
+  g_variant_builder_add_value (&b, p->visible_true_variant);
+
+  /* icon */
+  if (has_alarms)
+    g_variant_builder_add_value (&b, p->alarm_icon_variant);
+
+  /* label, a11y */
   now = indicator_datetime_service_get_localtime (self);
   fmt = get_terse_header_time_format_string ();
-  label = g_date_time_format (now, fmt);
-
-  /* icon */
-  if ((has_alarms = service_has_alarms (self)))
-    {
-      GIcon * icon;
-      icon = g_themed_icon_new_with_default_fallbacks (ALARM_CLOCK_ICON_NAME);
-      g_variant_builder_add (&b, "{sv}", "icon", g_icon_serialize (icon));
-      g_object_unref (icon);
-    }
-
-  /* a11y */
   if (has_alarms)
-    a11y = g_strdup_printf (_("%s (has alarms)"), label);
+    {
+      gchar * label = g_date_time_format (now, fmt);
+      gchar * a11y =  g_strdup_printf (_("%s (has alarms)"), label);
+      g_variant_builder_add (&b, "{sv}", "label", g_variant_new_take_string (label));
+      g_variant_builder_add (&b, "{sv}", "accessible-desc", g_variant_new_take_string (a11y));
+    }
   else
-    a11y = g_strdup (label);
-  g_variant_builder_add (&b, "{sv}", "accessible-desc",
-                         g_variant_new_take_string (a11y));
-
-  g_variant_builder_add (&b, "{sv}", "visible", g_variant_new_boolean (TRUE));
-  g_variant_builder_add (&b, "{sv}", "label", g_variant_new_take_string (label));
-  g_variant_builder_add (&b, "{sv}", "title", g_variant_new_string (title));
-
-  /* cleanup */
+    {
+      GVariant * v = g_variant_new_take_string (g_date_time_format (now, fmt));
+      g_variant_builder_add (&b, "{sv}", "label", v);
+      g_variant_builder_add (&b, "{sv}", "accessible-desc", v);
+    }
+
   g_date_time_unref (now);
   return g_variant_builder_end (&b);
 }
@@ -1100,61 +1095,6 @@
 ****
 ***/
 
-static void
-on_current_timezone_changed (IndicatorDatetimeService * self)
-{
-  on_local_time_jumped (self);
-}
-
-/* When the 'auto-detect timezone' boolean setting changes,
-   start or stop watching geoclue and /etc/timezone */
-static void
-set_detect_location_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 ();
-      g_signal_connect_swapped (p->tz_geoclue, "notify::timezone",
-                                G_CALLBACK(on_current_timezone_changed),
-                                self);
-      changed = TRUE;
-    }
-  else if (p->tz_geoclue && !enabled)
-    {
-      g_signal_handlers_disconnect_by_func (p->tz_geoclue,
-                                            on_current_timezone_changed,
-                                            self);
-      g_clear_object (&p->tz_geoclue);
-      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);
-}
 
 /* A temp struct used by create_locations_section()
    for pruning duplicates and sorting. */
@@ -1240,44 +1180,30 @@
   GSList * l;
   GSList * locations = NULL;
   gchar ** user_locations;
-  gboolean visible;
-  IndicatorDatetimeTimezone * detected_timezones[2];
+  const gchar ** detected_timezones;
   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));
-
   menu = g_menu_new ();
 
   /***
-  ****  Build a list of locations to add: use geo_timezone,
-  ****  current_timezone, and SETTINGS_LOCATIONS_S, but omit duplicates.
+  ****  Build a list of locations to add, omitting duplicates
   ***/
 
-  /* maybe add the auto-detected timezones */
-  detected_timezones[0] = p->tz_geoclue;
-  detected_timezones[1] = p->tz_file;
-  visible = g_settings_get_boolean (p->settings, SETTINGS_SHOW_DETECTED_S);
-  for (i=0; i<G_N_ELEMENTS(detected_timezones); i++)
+  detected_timezones = indicator_datetime_clock_get_timezones (p->clock);
+  for (i=0; detected_timezones && detected_timezones[i]; i++)
     {
-      if (detected_timezones[i] != NULL)
-        {
-          const char * tz = indicator_datetime_timezone_get_timezone (detected_timezones[i]);
-          if (tz && *tz)
-            {
-              gchar * name = get_current_zone_name (tz, p->settings);
-              locations = locations_add (locations, tz, name, visible);
-              g_free (name);
-            }
-        }
+      const char * tz = detected_timezones[i];
+      gchar * name = get_current_zone_name (tz, p->settings);
+      locations = locations_add (locations, tz, name, TRUE);
+      g_free (name);
     }
 
   /* maybe add the user-specified locations */
   user_locations = g_settings_get_strv (p->settings, SETTINGS_LOCATIONS_S);
   if (user_locations != NULL)
     {
-      visible = g_settings_get_boolean (p->settings, SETTINGS_SHOW_LOCATIONS_S);
+      const gboolean visible = g_settings_get_boolean (p->settings, SETTINGS_SHOW_LOCATIONS_S);
 
       for (i=0; user_locations[i] != NULL; i++)
         {
@@ -1735,6 +1661,9 @@
   struct ProfileMenuInfo * desktop = &p->menus[PROFILE_DESKTOP];
   struct ProfileMenuInfo * greeter = &p->menus[PROFILE_GREETER];
 
+  if (p->actions == NULL)
+    return;
+
   if (sections & SECTION_HEADER)
     {
       g_simple_action_set_state (p->desktop_header_action,
@@ -2088,6 +2017,10 @@
 
   switch (property_id)
     {
+      case PROP_CLOCK:
+        g_value_set_object (value, self->priv->clock);
+        break;
+
       case PROP_PLANNER:
         g_value_set_object (value, self->priv->planner);
         break;
@@ -2107,6 +2040,10 @@
 
   switch (property_id)
     {
+      case PROP_CLOCK:
+        indicator_datetime_service_set_clock (self, g_value_get_object (value));
+        break;
+
       case PROP_PLANNER:
         indicator_datetime_service_set_planner (self, g_value_get_object (value));
         break;
@@ -2138,8 +2075,7 @@
       g_clear_object (&p->cancellable);
     }
 
-  set_detect_location_enabled (self, FALSE);
-
+  indicator_datetime_service_set_clock (self, NULL);
   indicator_datetime_service_set_planner (self, NULL);
 
   if (p->login1_manager != NULL)
@@ -2165,12 +2101,17 @@
   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);
   g_clear_object (&p->conn);
 
+  g_clear_pointer (&p->desktop_title_variant, g_variant_unref);
+  g_clear_pointer (&p->phone_title_variant, g_variant_unref);
+  g_clear_pointer (&p->visible_true_variant, g_variant_unref);
+  g_clear_pointer (&p->visible_false_variant, g_variant_unref);
+  g_clear_pointer (&p->alarm_icon_variant, g_variant_unref);
+
   G_OBJECT_CLASS (indicator_datetime_service_parent_class)->dispose (o);
 }
 
@@ -2181,6 +2122,7 @@
   priv_t * p = self->priv;
 
   g_free (p->clock_app_icon_filename);
+  g_free (p->header_label_format_string);
   g_clear_pointer (&p->skew_time, g_date_time_unref);
   g_clear_pointer (&p->calendar_date, g_date_time_unref);
 
@@ -2194,9 +2136,45 @@
 static void
 indicator_datetime_service_init (IndicatorDatetimeService * self)
 {
+  GIcon * icon;
+  priv_t * p;
+
+  /* init the priv pointer */
+
+  p = G_TYPE_INSTANCE_GET_PRIVATE (self,
+                                   INDICATOR_TYPE_DATETIME_SERVICE,
+                                   IndicatorDatetimeServicePrivate);
+  self->priv = p;
+
+  p->cancellable = g_cancellable_new ();
+
+  p->settings = g_settings_new (SETTINGS_INTERFACE);
+
+  p->desktop_title_variant = g_variant_new ("{sv}", "title", g_variant_new_string (_("Date and Time")));
+  g_variant_ref_sink (p->desktop_title_variant);
+
+  p->phone_title_variant = g_variant_new ("{sv}", "title", g_variant_new_string (_("Upcoming")));
+  g_variant_ref_sink (p->phone_title_variant);
+
+  p->visible_true_variant = g_variant_new ("{sv}", "visible", g_variant_new_boolean (TRUE));
+  g_variant_ref_sink (p->visible_true_variant);
+
+  p->visible_false_variant = g_variant_new ("{sv}", "visible", g_variant_new_boolean (FALSE));
+  g_variant_ref_sink (p->visible_false_variant);
+
+  icon = g_themed_icon_new_with_default_fallbacks (ALARM_CLOCK_ICON_NAME);
+  p->alarm_icon_variant = g_variant_new ("{sv}", "icon", g_icon_serialize (icon));
+  g_variant_ref_sink (p->alarm_icon_variant);
+  g_object_unref (icon);
+}
+
+static void
+my_constructed (GObject * gself)
+{
+  IndicatorDatetimeService * self = INDICATOR_DATETIME_SERVICE (gself);
+  priv_t * p = self->priv;
+  GString * gstr = g_string_new (NULL);
   guint i, n;
-  priv_t * p;
-  GString * gstr = g_string_new (NULL);
 
   /* these are the settings that affect the
      contents of the respective sections */
@@ -2233,20 +2211,10 @@
   };
     
 
-  /* init the priv pointer */
-
-  p = G_TYPE_INSTANCE_GET_PRIVATE (self,
-                                   INDICATOR_TYPE_DATETIME_SERVICE,
-                                   IndicatorDatetimeServicePrivate);
-  self->priv = p;
-
-  p->cancellable = g_cancellable_new ();
-
   /***
-  ****  Create the settings object and listen for changes
+  ****  Listen for settings changes
   ***/
 
-  p->settings = g_settings_new (SETTINGS_INTERFACE);
   for (i=0, n=G_N_ELEMENTS(header_settings); i<n; i++)
     {
       g_string_printf (gstr, "changed::%s", header_settings[i]);
@@ -2327,6 +2295,7 @@
 
   object_class->dispose = my_dispose;
   object_class->finalize = my_finalize;
+  object_class->constructed = my_constructed;
   object_class->get_property = my_get_property;
   object_class->set_property = my_set_property;
 
@@ -2345,6 +2314,12 @@
 
   properties[PROP_0] = NULL;
 
+  properties[PROP_CLOCK] = g_param_spec_object ("clock",
+                                                "Clock",
+                                                "The clock",
+                                                INDICATOR_TYPE_DATETIME_CLOCK,
+                                                flags);
+
   properties[PROP_PLANNER] = g_param_spec_object ("planner",
                                                   "Planner",
                                                   "The appointment provider",
@@ -2359,28 +2334,17 @@
 ***/
 
 IndicatorDatetimeService *
-indicator_datetime_service_new (IndicatorDatetimePlanner * planner)
+indicator_datetime_service_new (IndicatorDatetimeClock   * clock,
+                                IndicatorDatetimePlanner * planner)
 {
   GObject * o = g_object_new (INDICATOR_TYPE_DATETIME_SERVICE,
+                              "clock", clock,
                               "planner", planner,
                               NULL);
 
   return INDICATOR_DATETIME_SERVICE (o);
 }
 
-/* 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)
-{
-  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
 indicator_datetime_service_set_calendar_date (IndicatorDatetimeService * self,
                                               GDateTime                * date)
@@ -2400,6 +2364,43 @@
     update_appointment_lists (self);
 }
 
+static void
+on_clock_changed (IndicatorDatetimeService * self)
+{
+  on_local_time_jumped (self);
+}
+
+void
+indicator_datetime_service_set_clock (IndicatorDatetimeService * self,
+                                      IndicatorDatetimeClock   * clock)
+{
+  priv_t * p;
+
+  g_return_if_fail (INDICATOR_IS_DATETIME_SERVICE (self));
+  g_return_if_fail ((clock == NULL) || INDICATOR_IS_DATETIME_CLOCK (clock));
+
+  p = self->priv;
+
+  /* clear the old clock */
+
+  if (p->clock != NULL)
+    {
+      g_signal_handlers_disconnect_by_data (p->clock, self);
+      g_clear_object (&p->clock);
+    }
+
+  /* set the new clock */
+
+  if (clock != NULL)
+    {
+      p->clock = g_object_ref (clock);
+
+      g_signal_connect_swapped (p->clock, "changed",
+                                G_CALLBACK(on_clock_changed), self);
+      on_clock_changed (self);
+    }
+}
+
 void
 indicator_datetime_service_set_planner (IndicatorDatetimeService * self,
                                         IndicatorDatetimePlanner * planner)
@@ -2407,7 +2408,7 @@
   priv_t * p;
 
   g_return_if_fail (INDICATOR_IS_DATETIME_SERVICE (self));
-  g_return_if_fail (INDICATOR_IS_DATETIME_PLANNER (planner));
+  g_return_if_fail ((planner == NULL) || INDICATOR_IS_DATETIME_PLANNER (planner));
 
   p = self->priv;
 

=== modified file 'src/service.h'
--- src/service.h	2013-10-10 02:02:17 +0000
+++ src/service.h	2013-10-23 18:14:52 +0000
@@ -22,6 +22,8 @@
 
 #include <glib.h>
 #include <glib-object.h>
+
+#include "clock.h"
 #include "planner.h"
 
 G_BEGIN_DECLS
@@ -63,9 +65,8 @@
 
 GType indicator_datetime_service_get_type (void);
 
-IndicatorDatetimeService * indicator_datetime_service_new (IndicatorDatetimePlanner * planner);
-
-GDateTime * indicator_datetime_service_get_localtime (IndicatorDatetimeService * service);
+IndicatorDatetimeService * indicator_datetime_service_new (IndicatorDatetimeClock   * clock,
+                                                           IndicatorDatetimePlanner * planner);
 
 void indicator_datetime_service_set_calendar_date (IndicatorDatetimeService * self,
                                                    GDateTime                * date);
@@ -74,6 +75,9 @@
                                              IndicatorDatetimePlanner * planner);
 
 
+void indicator_datetime_service_set_clock (IndicatorDatetimeService * self,
+                                           IndicatorDatetimeClock * clock);
+
 
 G_END_DECLS
 

=== modified file 'src/timezone.h'
--- src/timezone.h	2013-09-09 17:43:31 +0000
+++ src/timezone.h	2013-10-23 18:14:52 +0000
@@ -37,8 +37,6 @@
 
 GType indicator_datetime_timezone_get_type (void);
 
-#define INDICATOR_DATETIME_TIMEZONE_PROPERTY_TIMEZONE "timezone"
-
 /**
  * Abstract Base Class for objects that provide a timezone.
  *

=== renamed file 'src/planner-mock.c' => 'tests/planner-mock.c'
=== renamed file 'src/planner-mock.h' => 'tests/planner-mock.h'