Indicator Date and Time

Merge lp:~charlesk/indicator-datetime/use-url-dispatcher into lp:~indicator-applet-developers/indicator-datetime/trunk.13.10

  1. use-url-dispatcher
  2. Merge into trunk.13.10
Proposed by Charles Kerr
Status: Merged
Approved by: Ted Gould
Approved revision: 260
Merged at revision: 260
Proposed branch: lp:~charlesk/indicator-datetime/use-url-dispatcher
Merge into: lp:~indicator-applet-developers/indicator-datetime/trunk.13.10
Diff against target: 60 lines (+11/-7)
3 files modified
configure.ac (+8/-6)
debian/control (+1/-0)
src/service.c (+2/-1)
To merge this branch: bzr merge lp:~charlesk/indicator-datetime/use-url-dispatcher
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+187618@code.launchpad.net

Commit message

Use url-dispatcher instead of invoking system-settings directly.

Description of the change

Use url-dispatcher instead of invoking system-settings directly.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

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

review: Approve (continuous-integration)
Revision history for this message
Ted Gould (ted) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2013-08-27 15:30:04 +0000
3+++ configure.ac 2013-09-25 22:17:19 +0000
4@@ -51,15 +51,17 @@
5 ICAL_REQUIRED_VERSION=0.48
6 ECAL_REQUIRED_VERSION=3.5
7 EDS_REQUIRED_VERSION=3.5
8+URL_DISPATCHER_1_REQUIRED_VERSION=1
9
10 GTK3_REQUIRED_VERSION=3.1.4
11
12-PKG_CHECK_MODULES(SERVICE, glib-2.0 >= $GLIB_REQUIRED_VERSION
13- gio-2.0 >= $GIO_REQUIRED_VERSION
14- geoclue >= $GEOCLUE_REQUIRED_VERSION
15- libical >= $ICAL_REQUIRED_VERSION
16- libecal-1.2 >= $ECAL_REQUIRED_VERSION
17- libedataserver-1.2 >= EDS_REQUIRED_VERSION)
18+PKG_CHECK_MODULES(SERVICE, [glib-2.0 >= $GLIB_REQUIRED_VERSION
19+ gio-2.0 >= $GIO_REQUIRED_VERSION
20+ geoclue >= $GEOCLUE_REQUIRED_VERSION
21+ libical >= $ICAL_REQUIRED_VERSION
22+ libecal-1.2 >= $ECAL_REQUIRED_VERSION
23+ libedataserver-1.2 >= EDS_REQUIRED_VERSION
24+ url-dispatcher-1 >= URL_DISPATCHER_1_REQUIRED_VERSION])
25
26 ###########################
27 # Control Center panel
28
29=== modified file 'debian/control'
30--- debian/control 2013-08-27 15:49:33 +0000
31+++ debian/control 2013-09-25 22:17:19 +0000
32@@ -22,6 +22,7 @@
33 libgconf2-dev (>= 2.31),
34 libgnome-control-center-dev,
35 libtimezonemap1-dev,
36+ liburl-dispatcher1-dev,
37 Standards-Version: 3.9.3
38 Homepage: https://launchpad.net/indicator-datetime
39 # If you aren't a member of ~indicator-applet-developers but need to upload
40
41=== modified file 'src/service.c'
42--- src/service.c 2013-09-11 17:12:10 +0000
43+++ src/service.c 2013-09-25 22:17:19 +0000
44@@ -24,6 +24,7 @@
45
46 #include <glib/gi18n.h>
47 #include <gio/gio.h>
48+#include <url-dispatcher.h>
49
50 #include "dbus-shared.h"
51 #include "planner-eds.h"
52@@ -1282,7 +1283,7 @@
53 GVariant * param G_GNUC_UNUSED,
54 gpointer gself G_GNUC_UNUSED)
55 {
56- execute_command ("system-settings time-date");
57+ url_dispatch_send ("settings://system/time-date", NULL, NULL);
58 }
59
60 static void

Subscribers

People subscribed via source and target branches