Bluetooth Menu

Merge lp:~charlesk/indicator-bluetooth/use-url-dispatcher into lp:indicator-bluetooth/13.10

  1. use-url-dispatcher
  2. Merge into trunk
Proposed by Charles Kerr
Status: Merged
Approved by: Ted Gould
Approved revision: 62
Merged at revision: 62
Proposed branch: lp:~charlesk/indicator-bluetooth/use-url-dispatcher
Merge into: lp:indicator-bluetooth/13.10
Diff against target: 68 lines (+16/-2)
5 files modified
configure.ac (+4/-1)
debian/control (+1/-0)
src/Makefile.am (+1/-0)
src/phone.vala (+1/-1)
vapi/url-dispatcher.vapi (+9/-0)
To merge this branch: bzr merge lp:~charlesk/indicator-bluetooth/use-url-dispatcher
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Ted Gould (community) Approve
Review via email: mp+187595@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
Ted Gould (ted) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

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-06 18:05:19 +0000
3+++ configure.ac 2013-09-25 20:07:45 +0000
4@@ -16,9 +16,12 @@
5
6 GLIB_REQUIRED_VERSION=2.36
7 GIO_REQUIRED_VERSION=2.36
8+URL_DISPATCHER_1_REQUIRED_VERSION=1
9
10 PKG_CHECK_MODULES(SERVICE_DEPS, [glib-2.0 >= $GLIB_REQUIRED_VERSION
11- gio-unix-2.0 >= $GIO_REQUIRED_VERSION])
12+ gio-unix-2.0 >= $GIO_REQUIRED_VERSION
13+ url-dispatcher-1 >= $URL_DISPATCHER_1_REQUIRED_VERSION])
14+
15
16 dnl ##############################
17 dnl # Custom Junk
18
19=== modified file 'debian/control'
20--- debian/control 2013-08-08 19:23:08 +0000
21+++ debian/control 2013-09-25 20:07:45 +0000
22@@ -7,6 +7,7 @@
23 dh-translations,
24 gnome-common,
25 libglib2.0-dev,
26+ liburl-dispatcher1-dev,
27 valac (>=0.18),
28 Standards-Version: 3.9.4
29 Homepage: https://launchpad.net/indicator-bluetooth
30
31=== modified file 'src/Makefile.am'
32--- src/Makefile.am 2013-08-06 00:56:44 +0000
33+++ src/Makefile.am 2013-09-25 20:07:45 +0000
34@@ -18,6 +18,7 @@
35 --vapidir=./ \
36 --pkg config \
37 --pkg rfkill \
38+ --pkg url-dispatcher \
39 --pkg posix \
40 --pkg glib-2.0 \
41 --pkg gio-2.0
42
43=== modified file 'src/phone.vala'
44--- src/phone.vala 2013-08-22 16:25:21 +0000
45+++ src/phone.vala 2013-09-25 20:07:45 +0000
46@@ -61,7 +61,7 @@
47
48 void show_settings (string panel)
49 {
50- spawn_command_line_async ("system-settings " + panel);
51+ UrlDispatch.send ("settings://system/bluetooth");
52 }
53
54 Action create_settings_action ()
55
56=== added file 'vapi/url-dispatcher.vapi'
57--- vapi/url-dispatcher.vapi 1970-01-01 00:00:00 +0000
58+++ vapi/url-dispatcher.vapi 2013-09-25 20:07:45 +0000
59@@ -0,0 +1,9 @@
60+[CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "liburl-dispatcher-1/url-dispatcher.h")]
61+
62+namespace UrlDispatch
63+{
64+ public delegate void DispatchCallback ();
65+
66+ [CCode (cname = "url_dispatch_send")]
67+ public static void send (string url, DispatchCallback? func = null);
68+}

Subscribers

People subscribed via source and target branches