From 158a962cee927c7b4cb9a70266681886a8895b48 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Wed, 25 Sep 2013 17:16:22 -0500
Subject: Use url-dispatcher instead of invoking system-settings directly.

---
 configure.ac   | 14 ++++++++------
 debian/control |  1 +
 src/service.c  |  3 ++-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index c165a3b..8b95695 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,15 +51,17 @@ GEOCLUE_REQUIRED_VERSION=0.12.0
 ICAL_REQUIRED_VERSION=0.48
 ECAL_REQUIRED_VERSION=3.5
 EDS_REQUIRED_VERSION=3.5
+URL_DISPATCHER_1_REQUIRED_VERSION=1
 
 GTK3_REQUIRED_VERSION=3.1.4
 
-PKG_CHECK_MODULES(SERVICE, glib-2.0 >= $GLIB_REQUIRED_VERSION
-                           gio-2.0 >= $GIO_REQUIRED_VERSION
-                           geoclue >= $GEOCLUE_REQUIRED_VERSION
-                           libical >= $ICAL_REQUIRED_VERSION
-                           libecal-1.2 >= $ECAL_REQUIRED_VERSION
-                           libedataserver-1.2 >= EDS_REQUIRED_VERSION)
+PKG_CHECK_MODULES(SERVICE, [glib-2.0 >= $GLIB_REQUIRED_VERSION
+                            gio-2.0 >= $GIO_REQUIRED_VERSION
+                            geoclue >= $GEOCLUE_REQUIRED_VERSION
+                            libical >= $ICAL_REQUIRED_VERSION
+                            libecal-1.2 >= $ECAL_REQUIRED_VERSION
+                            libedataserver-1.2 >= EDS_REQUIRED_VERSION
+                            url-dispatcher-1 >= URL_DISPATCHER_1_REQUIRED_VERSION])
 
 ###########################
 # Control Center panel
diff --git a/debian/control b/debian/control
index ae07129..67938bf 100644
--- a/debian/control
+++ b/debian/control
@@ -22,6 +22,7 @@ Build-Depends: debhelper (>= 9),
                libgconf2-dev (>= 2.31),
                libgnome-control-center-dev,
                libtimezonemap1-dev,
+               liburl-dispatcher1-dev,
 Standards-Version: 3.9.3
 Homepage: https://launchpad.net/indicator-datetime
 # If you aren't a member of ~indicator-applet-developers but need to upload
diff --git a/src/service.c b/src/service.c
index ce8139f..2528f41 100644
--- a/src/service.c
+++ b/src/service.c
@@ -24,6 +24,7 @@
 
 #include <glib/gi18n.h>
 #include <gio/gio.h>
+#include <url-dispatcher.h>
 
 #include "dbus-shared.h"
 #include "planner-eds.h"
@@ -1282,7 +1283,7 @@ on_phone_settings_activated (GSimpleAction * a      G_GNUC_UNUSED,
                              GVariant      * param  G_GNUC_UNUSED,
                              gpointer        gself  G_GNUC_UNUSED)
 {
-  execute_command ("system-settings time-date");
+  url_dispatch_send ("settings://system/time-date", NULL, NULL);
 }
 
 static void
-- 
cgit v1.2.3