Merge lp:~ted/indicator-datetime/upstart-job into lp:~indicator-applet-developers/indicator-datetime/trunk.13.10

[Ted Gould]

Upstart Job

Upstart Job

[PS Jenkins bot (ps-jenkins)]

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

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-datetime-ci/84/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

Thanks for the work, similar to https://code.launchpad.net/~ted/indicator-session/upstart-job/+merge/166373 ... why do we need to export the env and do we need that to land this cycle?

[lp:~ted/indicator-datetime/upstart-job]

253. By Ted Gould on 2013-08-27

Dropping debugging for system-wide support

[PS Jenkins bot (ps-jenkins)]

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

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-datetime-ci/85/rebuild

review: Approve (continuous-integration)

[lp:~ted/indicator-datetime/upstart-job]

254. By Ted Gould on 2013-10-29

Merge trunk

255. By Ted Gould on 2013-10-29

Add in support for XDG Autostart

256. By Ted Gould on 2013-10-29

Install the autostart file

257. By Ted Gould on 2013-10-29

Ignore generated files

258. By Ted Gould on 2013-10-31

Merge trunk

259. By Ted Gould on 2013-10-31

Autostart directory

Unmerged revisions

259. By Ted Gould on 2013-10-31

Autostart directory

258. By Ted Gould on 2013-10-31

Merge trunk

257. By Ted Gould on 2013-10-29

Ignore generated files

256. By Ted Gould on 2013-10-29

Install the autostart file

255. By Ted Gould on 2013-10-29

Add in support for XDG Autostart

254. By Ted Gould on 2013-10-29

Merge trunk

253. By Ted Gould on 2013-08-27

Dropping debugging for system-wide support

252. By Ted Gould on 2013-08-27

Adding into the package

251. By Ted Gould on 2013-08-27

Adding the upstart job configuration

=== modified file '.bzrignore'
--- .bzrignore	2012-02-17 22:06:39 +0000
+++ .bzrignore	2013-10-29 00:19:32 +0000
@@ -15,3 +15,5 @@
 build-aux
 data/com.canonical.indicator.datetime.gschema.valid
 src/libdatetime_la-utils.lo
+data/indicator-datetime.conf
+data/indicator-datetime.desktop

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2013-06-28 21:41:31 +0000
+++ data/Makefile.am	2013-10-29 00:19:32 +0000
@@ -18,17 +18,30 @@
 EXTRA_DIST += $(gsettings_SCHEMAS)
 
 #
-# the dbus service file
-#
-
-dbus_servicesdir = $(datadir)/dbus-1/services
-dbus_services_DATA = indicator-datetime.service
-dbus_services_in = $(dbus_services_DATA:.service=.service.in)
-$(dbus_services_DATA): $(dbus_services_in)
-	$(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-BUILT_SOURCES += $(dbus_services_DATA)
-CLEANFILES += $(dbus_services_DATA)
-EXTRA_DIST += $(dbus_services_in)
+# the upstart job file
+#
+
+upstart_jobsdir = $(datadir)/upstart/sessions
+upstart_jobs_DATA = indicator-datetime.conf
+upstart_jobs_in = $(upstart_jobs_DATA:.conf=.conf.in)
+$(upstart_jobs_DATA): $(upstart_jobs_in)
+	$(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+BUILT_SOURCES += $(upstart_jobs_DATA)
+CLEANFILES += $(upstart_jobs_DATA)
+EXTRA_DIST += $(upstart_jobs_in)
+
+#
+# the xdg autostart job file
+#
+
+xdg_autostartdir = /etc/xdg/autostart
+xdg_autostart_DATA = indicator-datetime.desktop
+xdg_autostart_in = $(xdg_autostart_DATA:.desktop=.desktop.in)
+$(xdg_autostart_DATA): $(xdg_autostart_in)
+	$(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+BUILT_SOURCES += $(xdg_autostart_DATA)
+CLEANFILES += $(xdg_autostart_DATA)
+EXTRA_DIST += $(xdg_autostart_in)
 
 #
 # the gnome-control-center panel

=== modified file 'data/com.canonical.indicator.datetime'
--- data/com.canonical.indicator.datetime	2013-07-25 18:08:34 +0000
+++ data/com.canonical.indicator.datetime	2013-10-29 00:19:32 +0000
@@ -12,3 +12,6 @@
 [phone]
 ObjectPath=/com/canonical/indicator/datetime/phone
 
+[phone_greeter]
+ObjectPath=/com/canonical/indicator/datetime/desktop_greeter
+

=== added file 'data/indicator-datetime.conf.in'
--- data/indicator-datetime.conf.in	1970-01-01 00:00:00 +0000
+++ data/indicator-datetime.conf.in	2013-10-29 00:19:32 +0000
@@ -0,0 +1,8 @@
+description "Indicator Date & Time Backend"
+
+start on indicators-loaded or indicator-services-start
+stop on desktop-end or indicator-services-end
+
+respawn
+
+exec @libexecdir@/indicator-datetime-service

=== added file 'data/indicator-datetime.desktop.in'
--- data/indicator-datetime.desktop.in	1970-01-01 00:00:00 +0000
+++ data/indicator-datetime.desktop.in	2013-10-29 00:19:32 +0000
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=Indicator Date & Time
+Exec=@libexecdir@/indicator-datetime-service
+NotShowIn=Unity;
+NoDisplay=true
+StartupNotify=false
+Terminal=false
+

=== removed file 'data/indicator-datetime.service.in'
--- data/indicator-datetime.service.in	2011-01-17 17:41:28 +0000
+++ data/indicator-datetime.service.in	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=com.canonical.indicator.datetime
-Exec=@libexecdir@/indicator-datetime-service

=== modified file 'debian/indicator-datetime.install'
--- debian/indicator-datetime.install	2013-08-27 14:52:26 +0000
+++ debian/indicator-datetime.install	2013-10-29 00:19:32 +0000
@@ -1,5 +1,6 @@
 usr/share/glib-2.0/schemas/*
-usr/share/dbus-1/services/*
+usr/share/upstart/sessions/*
 usr/share/unity/indicators/*
 usr/lib/*/indicator-datetime-service
 usr/share/locale/*
+etc/xdg/autostart/*

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2013-10-22 22:01:47 +0000
+++ src/Makefile.am	2013-10-29 00:19:32 +0000
@@ -18,6 +18,10 @@
   $(SHARED_CFLAGS)
 
 libindicator_datetime_service_a_SOURCES = \
+  clock.c \
+  clock.h \
+  clock-live.c \
+  clock-live.h \
   planner.c \
   planner.h \
   planner-eds.c \

=== added file 'src/clock-live.c'
--- src/clock-live.c	1970-01-01 00:00:00 +0000
+++ src/clock-live.c	2013-10-29 00:19:32 +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-29 00:19:32 +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-29 00:19:32 +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-29 00:19:32 +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/datetime-prefs-locations.c'
--- src/datetime-prefs-locations.c	2013-09-07 12:10:53 +0000
+++ src/datetime-prefs-locations.c	2013-10-29 00:19:32 +0000
@@ -96,7 +96,9 @@
                           COL_ZONE, &zone,
                           COL_VISIBLE_NAME, &name,
                           -1);
-      list = g_slist_prepend (list, time_location_new (zone, name, pos++, now));
+
+      if (zone && name)
+        list = g_slist_prepend (list, time_location_new (zone, name, pos++, now));
 
       g_free (name);
       g_free (zone);

=== modified file 'src/main.c'
--- src/main.c	2013-10-22 22:01:47 +0000
+++ src/main.c	2013-10-29 00:19:32 +0000
@@ -25,6 +25,11 @@
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 
+<<<<<<< TREE
+=======
+#include "clock-live.h"
+#include "planner-eds.h"
+>>>>>>> MERGE-SOURCE
 #include "service.h"
 
 /***
@@ -35,13 +40,23 @@
 on_name_lost (gpointer instance G_GNUC_UNUSED, gpointer loop)
 {
   g_message ("exiting: service couldn't acquire or lost ownership of busname");
-  g_main_loop_quit ((GMainLoop*)loop);
+<<<<<<< TREE
+  g_main_loop_quit ((GMainLoop*)loop);
+=======
+
+  g_main_loop_quit ((GMainLoop*)loop);
+>>>>>>> MERGE-SOURCE
 }
 
 int
 main (int argc G_GNUC_UNUSED, char ** argv G_GNUC_UNUSED)
 {
+<<<<<<< TREE
   GMainLoop * loop;
+=======
+  IndicatorDatetimeClock * clock;
+  IndicatorDatetimePlanner * planner;
+>>>>>>> MERGE-SOURCE
   IndicatorDatetimeService * service;
 
   /* Work around a deadlock in glib's type initialization. It can be
@@ -55,15 +70,37 @@
   bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
   textdomain (GETTEXT_PACKAGE);
 
+<<<<<<< TREE
+=======
+  /* init libnotify */
+  if (!notify_init ("indicator-datetime-service"))
+    g_critical ("libnotify initialization failed");
+
+  /* create the service */
+  clock = indicator_datetime_clock_live_new ();
+  planner = indicator_datetime_planner_eds_new ();
+  service = indicator_datetime_service_new (clock, planner);
+
+>>>>>>> MERGE-SOURCE
   /* run */
+<<<<<<< TREE
   service = indicator_datetime_service_new ();
+=======
+>>>>>>> MERGE-SOURCE
   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 */
+<<<<<<< TREE
   g_clear_object (&service);
   g_main_loop_unref (loop);
+=======
+  g_object_unref (service);
+  g_object_unref (planner);
+  g_object_unref (clock);
+>>>>>>> MERGE-SOURCE
   return 0;
 }

=== modified file 'src/service.c'
--- src/service.c	2013-10-22 22:01:47 +0000
+++ src/service.c	2013-10-29 00:19:32 +0000
@@ -28,9 +28,12 @@
 #include <url-dispatcher.h>
 
 #include "dbus-shared.h"
+<<<<<<< TREE
 #include "planner-eds.h"
 #include "timezone-file.h"
 #include "timezone-geoclue.h"
+=======
+>>>>>>> MERGE-SOURCE
 #include "service.h"
 #include "settings-shared.h"
 #include "utils.h"
@@ -53,6 +56,19 @@
 
 enum
 {
+<<<<<<< TREE
+=======
+  PROP_0,
+  PROP_CLOCK,
+  PROP_PLANNER,
+  PROP_LAST
+};
+
+static GParamSpec * properties[PROP_LAST] = { 0 };
+
+enum
+{
+>>>>>>> MERGE-SOURCE
   SECTION_HEADER        = (1<<0),
   SECTION_CALENDAR      = (1<<1),
   SECTION_APPOINTMENTS  = (1<<2),
@@ -92,16 +108,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;
@@ -140,6 +154,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;
@@ -158,6 +179,12 @@
     }
 }
 
+static inline GDateTime *
+indicator_datetime_service_get_localtime (IndicatorDatetimeService * self)
+{
+  return indicator_datetime_clock_get_localtime (self->priv->clock);
+}
+
 /***
 ****
 ***/
@@ -168,6 +195,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);
 }
 
@@ -350,7 +379,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)
@@ -364,11 +393,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)
@@ -388,6 +416,7 @@
   g_date_time_unref (now);
 }
 
+<<<<<<< TREE
 static void
 update_internal_timezone (IndicatorDatetimeService * self)
 {
@@ -405,6 +434,199 @@
   p->internal_timezone = g_time_zone_new (id);
 }
 
+=======
+/***
+****  ALARMS
+***/
+
+static void set_alarm_timer (IndicatorDatetimeService * self);
+
+static gboolean
+appointment_has_alarm_url (const struct IndicatorDatetimeAppt * appt)
+{
+  return (appt->has_alarms) &&
+         (appt->url != NULL) &&
+         (g_str_has_prefix (appt->url, "alarm:///"));
+}
+
+static gboolean
+datetimes_have_the_same_minute (GDateTime * a G_GNUC_UNUSED, GDateTime * b G_GNUC_UNUSED)
+{
+  int ay, am, ad;
+  int by, bm, bd;
+
+  g_date_time_get_ymd (a, &ay, &am, &ad);
+  g_date_time_get_ymd (b, &by, &bm, &bd);
+
+  return (ay == by) &&
+         (am == bm) &&
+         (ad == bd) &&
+         (g_date_time_get_hour (a) == g_date_time_get_hour (b)) &&
+         (g_date_time_get_minute (a) == g_date_time_get_minute (b));
+}
+
+static void
+dispatch_alarm_url (const struct IndicatorDatetimeAppt * appt)
+{
+  gchar * str;
+
+  g_return_if_fail (appt != NULL);
+  g_return_if_fail (appointment_has_alarm_url (appt));
+
+  str = g_date_time_format (appt->begin, "%F %T");
+  g_debug ("dispatching url \"%s\" for appointment \"%s\", which begins at %s",
+           appt->url, appt->summary, str);
+  g_free (str);
+
+  url_dispatch_send (appt->url, NULL, NULL);
+}
+
+static void
+on_snap_decided (NotifyNotification * notification  G_GNUC_UNUSED,
+                 char               * action,
+                 gpointer             gurl)
+{
+  g_debug ("%s: %s", G_STRFUNC, action);
+
+  if (!g_strcmp0 (action, "show"))
+    {
+      const gchar * url = gurl;
+      g_debug ("dispatching url '%s'", url);
+      url_dispatch_send (url, NULL, NULL);
+    }
+}
+
+static void
+show_snap_decision_for_alarm (const struct IndicatorDatetimeAppt * appt)
+{
+  gchar * title;
+  const gchar * body;
+  const gchar * icon_name;
+  NotifyNotification * nn;
+  GError * error;
+
+  title = g_date_time_format (appt->begin,
+                              get_terse_time_format_string (appt->begin));
+  body = appt->summary;
+  icon_name = ALARM_CLOCK_ICON_NAME;
+  g_debug ("creating a snap decision with title '%s', body '%s', icon '%s'",
+           title, body, icon_name);
+
+  nn = notify_notification_new (title, body, icon_name);
+  notify_notification_set_hint_string (nn,
+                                       "x-canonical-snap-decisions",
+                                       "true");
+  notify_notification_set_hint_string (nn,
+                                       "x-canonical-private-button-tint",
+                                       "true");
+  notify_notification_add_action (nn, "show", _("Show"),
+                                  on_snap_decided, g_strdup(appt->url), g_free);
+  notify_notification_add_action (nn, "dismiss", _("Dismiss"),
+                                  on_snap_decided, NULL, NULL);
+
+  error = NULL;
+  notify_notification_show (nn, &error);
+  if (error != NULL)
+    {
+      g_warning ("Unable to show alarm '%s' popup: %s", body, error->message);
+      g_error_free (error);
+      dispatch_alarm_url (appt);
+    }
+
+  g_free (title);
+}
+
+static void update_appointment_lists (IndicatorDatetimeService * self);
+
+static gboolean
+on_alarm_timer (gpointer gself)
+{
+  IndicatorDatetimeService * self = INDICATOR_DATETIME_SERVICE (gself);
+  GDateTime * now;
+  GSList * l;
+
+  /* If there are any alarms at the current time, show a snap decision */
+  now = indicator_datetime_service_get_localtime (self);
+  for (l=self->priv->upcoming_appointments; l!=NULL; l=l->next)
+    {
+      const struct IndicatorDatetimeAppt * appt = l->data;
+
+      if (appointment_has_alarm_url (appt))
+        if (datetimes_have_the_same_minute (now, appt->begin))
+          show_snap_decision_for_alarm (appt);
+    }
+  g_date_time_unref (now);
+
+  /* rebuild the alarm list asynchronously.
+     set_upcoming_appointments() will update the alarm timer when this
+     async call is done, so no need to restart the timer here... */
+  update_appointment_lists (self);
+
+  return G_SOURCE_REMOVE;
+}
+
+/* if there are upcoming alarms, set the alarm timer to the nearest one.
+   otherwise, unset the alarm timer. */
+static void
+set_alarm_timer (IndicatorDatetimeService * self)
+{
+  priv_t * p;
+  GDateTime * now;
+  GDateTime * alarm_time;
+  GSList * l;
+
+  p = self->priv;
+  indicator_clear_timer (&p->alarm_timer);
+
+  now = indicator_datetime_service_get_localtime (self);
+
+  /* find the time of the next alarm on our calendar */
+  alarm_time = NULL;
+  for (l=p->upcoming_appointments; l!=NULL; l=l->next)
+    {
+      const struct IndicatorDatetimeAppt * appt = l->data;
+
+      if (appointment_has_alarm_url (appt))
+        if (g_date_time_compare (appt->begin, now) > 0)
+          if (!alarm_time || g_date_time_compare (alarm_time, appt->begin) > 0)
+            alarm_time = appt->begin;
+    }
+
+  /* if there's an upcoming alarm, set a timer to wake up at that time */
+  if (alarm_time != NULL)
+    {
+      GTimeSpan interval_msec;
+      gchar * str;
+      GDateTime * then;
+
+      interval_msec = g_date_time_difference (alarm_time, now);
+      interval_msec += G_USEC_PER_SEC; /* fire a moment after alarm_time */
+      interval_msec /= 1000; /* convert from usec to msec */
+
+      str = g_date_time_format (alarm_time, "%F %T");
+      g_debug ("%s is the next alarm time", str);
+      g_free (str);
+      then = g_date_time_add_seconds (now, interval_msec/1000);
+      str = g_date_time_format (then, "%F %T");
+      g_debug ("%s is when we'll wake up for it", str);
+      g_free (str);
+      g_date_time_unref (then);
+
+      p->alarm_timer = g_timeout_add_full (G_PRIORITY_HIGH,
+                                           (guint) interval_msec,
+                                           on_alarm_timer,
+                                           self,
+                                           NULL);
+    }
+
+  g_date_time_unref (now);
+}
+
+/***
+****
+***/
+
+>>>>>>> MERGE-SOURCE
 /**
  * General purpose handler for rebuilding sections and restarting their timers
  * when time jumps for whatever reason:
@@ -423,7 +645,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);
 }
@@ -455,38 +676,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);
@@ -498,15 +727,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);
 }
 
@@ -516,43 +745,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);
 }
@@ -879,61 +1102,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. */
@@ -1019,44 +1187,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++)
         {
@@ -1485,6 +1639,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,
@@ -1825,6 +1982,56 @@
 ***/
 
 static void
+<<<<<<< TREE
+=======
+my_get_property (GObject     * o,
+                 guint         property_id,
+                 GValue      * value,
+                 GParamSpec  * pspec)
+{
+  IndicatorDatetimeService * self = INDICATOR_DATETIME_SERVICE (o);
+
+  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;
+
+      default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (o, property_id, pspec);
+    }
+}
+
+static void
+my_set_property (GObject       * o,
+                 guint           property_id,
+                 const GValue  * value,
+                 GParamSpec    * pspec)
+{
+  IndicatorDatetimeService * self = INDICATOR_DATETIME_SERVICE (o);
+
+  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;
+
+      default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (o, property_id, pspec);
+    }
+}
+
+
+static void
+>>>>>>> MERGE-SOURCE
 my_dispose (GObject * o)
 {
   int i;
@@ -1845,6 +2052,7 @@
       g_clear_object (&p->cancellable);
     }
 
+<<<<<<< TREE
   set_detect_location_enabled (self, FALSE);
 
   if (p->planner != NULL)
@@ -1854,6 +2062,10 @@
     }
   g_clear_pointer (&p->upcoming_appointments, indicator_datetime_planner_free_appointments);
   g_clear_pointer (&p->calendar_appointments, indicator_datetime_planner_free_appointments);
+=======
+  indicator_datetime_service_set_clock (self, NULL);
+  indicator_datetime_service_set_planner (self, NULL);
+>>>>>>> MERGE-SOURCE
 
   if (p->login1_manager != NULL)
     {
@@ -1877,12 +2089,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);
 }
 
@@ -1893,6 +2110,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);
 
@@ -1906,9 +2124,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 */
@@ -1945,16 +2199,8 @@
   };
     
 
-  /* init the priv pointer */
-
-  p = G_TYPE_INSTANCE_GET_PRIVATE (self,
-                                   INDICATOR_TYPE_DATETIME_SERVICE,
-                                   IndicatorDatetimeServicePrivate);
-  self->priv = p;
-
-  p->cancellable = g_cancellable_new ();
-
   /***
+<<<<<<< TREE
   ****  Create the planner and listen for changes
   ***/
 
@@ -1966,9 +2212,11 @@
 
   /***
   ****  Create the settings object and listen for changes
+=======
+  ****  Listen for settings changes
+>>>>>>> MERGE-SOURCE
   ***/
 
-  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]);
@@ -2046,6 +2294,12 @@
 
   object_class->dispose = my_dispose;
   object_class->finalize = my_finalize;
+<<<<<<< TREE
+=======
+  object_class->constructed = my_constructed;
+  object_class->get_property = my_get_property;
+  object_class->set_property = my_set_property;
+>>>>>>> MERGE-SOURCE
 
   g_type_class_add_private (klass, sizeof (IndicatorDatetimeServicePrivate));
 
@@ -2057,6 +2311,27 @@
     NULL, NULL,
     g_cclosure_marshal_VOID__VOID,
     G_TYPE_NONE, 0);
+<<<<<<< TREE
+=======
+
+  /* install properties */
+
+  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",
+                                                  INDICATOR_TYPE_DATETIME_PLANNER,
+                                                  flags);
+
+  g_object_class_install_properties (object_class, PROP_LAST, properties);
+>>>>>>> MERGE-SOURCE
 }
 
 /***
@@ -2064,26 +2339,25 @@
 ***/
 
 IndicatorDatetimeService *
+<<<<<<< TREE
 indicator_datetime_service_new (void)
+=======
+indicator_datetime_service_new (IndicatorDatetimeClock   * clock,
+                                IndicatorDatetimePlanner * planner)
+>>>>>>> MERGE-SOURCE
 {
+<<<<<<< TREE
   GObject * o = g_object_new (INDICATOR_TYPE_DATETIME_SERVICE, NULL);
+=======
+  GObject * o = g_object_new (INDICATOR_TYPE_DATETIME_SERVICE,
+                              "clock", clock,
+                              "planner", planner,
+                              NULL);
+>>>>>>> MERGE-SOURCE
 
   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)
@@ -2102,3 +2376,78 @@
   if (dirty)
     update_appointment_lists (self);
 }
+<<<<<<< TREE
+=======
+
+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)
+{
+  priv_t * p;
+
+  g_return_if_fail (INDICATOR_IS_DATETIME_SERVICE (self));
+  g_return_if_fail ((planner == NULL) || INDICATOR_IS_DATETIME_PLANNER (planner));
+
+  p = self->priv;
+
+  /* clear the old planner & appointments */
+
+  if (p->planner != NULL)
+    {
+      g_signal_handlers_disconnect_by_data (p->planner, self);
+      g_clear_object (&p->planner);
+    }
+
+  g_clear_pointer (&p->upcoming_appointments, indicator_datetime_planner_free_appointments);
+  g_clear_pointer (&p->calendar_appointments, indicator_datetime_planner_free_appointments);
+
+  /* set the new planner & begin fetching appointments from it */
+
+  if (planner != NULL)
+    {
+      p->planner = g_object_ref (planner);
+
+      g_signal_connect_swapped (p->planner, "appointments-changed",
+                                G_CALLBACK(update_appointment_lists), self);
+
+      update_appointment_lists (self);
+    }
+}
+>>>>>>> MERGE-SOURCE

=== modified file 'src/service.h'
--- src/service.h	2013-10-22 22:01:47 +0000
+++ src/service.h	2013-10-29 00:19:32 +0000
@@ -22,6 +22,12 @@
 
 #include <glib.h>
 #include <glib-object.h>
+<<<<<<< TREE
+=======
+
+#include "clock.h"
+#include "planner.h"
+>>>>>>> MERGE-SOURCE
 
 G_BEGIN_DECLS
 
@@ -62,13 +68,28 @@
 
 GType indicator_datetime_service_get_type (void);
 
+<<<<<<< TREE
 IndicatorDatetimeService * indicator_datetime_service_new (void);
 
 GDateTime * indicator_datetime_service_get_localtime (IndicatorDatetimeService * service);
+=======
+IndicatorDatetimeService * indicator_datetime_service_new (IndicatorDatetimeClock   * clock,
+                                                           IndicatorDatetimePlanner * planner);
+>>>>>>> MERGE-SOURCE
 
 void indicator_datetime_service_set_calendar_date (IndicatorDatetimeService * self,
                                                    GDateTime                * date);
 
+<<<<<<< TREE
+=======
+void indicator_datetime_service_set_planner (IndicatorDatetimeService * self,
+                                             IndicatorDatetimePlanner * planner);
+
+
+void indicator_datetime_service_set_clock (IndicatorDatetimeService * self,
+                                           IndicatorDatetimeClock * clock);
+
+>>>>>>> MERGE-SOURCE
 
 G_END_DECLS
 

=== modified file 'src/timezone.h'
--- src/timezone.h	2013-09-09 17:43:31 +0000
+++ src/timezone.h	2013-10-29 00:19:32 +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.
  *