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

[Charles Kerr]

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

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

[lp:~charlesk/indicator-sound/use-url-dispatcher]

382. By Charles Kerr on 2013-09-25

oops, forgot to bzr add the vapi

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:381
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/50/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-saucy-amd64-ci/31
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-saucy-armhf-ci/31
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-saucy-armhf-ci/31/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:382
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/51/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-saucy-amd64-ci/32
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-saucy-armhf-ci/32
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-saucy-armhf-ci/32/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Ted Gould (ted)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-08-19 17:01:44 +0000
+++ CMakeLists.txt	2013-09-25 21:20:03 +0000
@@ -25,11 +25,13 @@
 
 set(PULSE_AUDIO_REQUIRED_VERSION 0.9.19)
 set(GIO_2_0_REQUIRED_VERSION 2.25.13)
+set(URL_DISPATCHER_1_REQUIRED_VERSION 1)
 
 pkg_check_modules(
   PULSEAUDIO REQUIRED
   libpulse-mainloop-glib>=${PULSE_AUDIO_REQUIRED_VERSION}
-  gio-unix-2.0
+  gio-unix-2.0>=${GIO_2_0_REQUIRED_VERSION}
+  url-dispatcher-1>=${URL_DISPATCHER_1_REQUIRED_VERSION}
 )
 include_directories(${PULSEAUDIO_INCLUDE_DIRS})
 

=== modified file 'debian/control'
--- debian/control	2013-09-24 14:59:38 +0000
+++ debian/control	2013-09-25 21:20:03 +0000
@@ -10,6 +10,7 @@
                autotools-dev,
                valac (>= 0.18),
                libglib2.0-dev (>= 2.22.3),
+               liburl-dispatcher1-dev,
                libpulse-dev (>= 0.9.18),
                libpulse-mainloop-glib0 (>= 0.9.18),
                libgee-dev,

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2013-08-26 14:51:33 +0000
+++ src/CMakeLists.txt	2013-09-25 21:20:03 +0000
@@ -20,6 +20,7 @@
     --vapidir=${CMAKE_SOURCE_DIR}/vapi/
     --vapidir=.
     --target-glib=2.36
+    --pkg=url-dispatcher
     --pkg=bus-watcher
 )
 

=== modified file 'src/service.vala'
--- src/service.vala	2013-09-15 18:31:36 +0000
+++ src/service.vala	2013-09-25 21:20:03 +0000
@@ -108,11 +108,7 @@
 	}
 
 	void activate_phone_settings (SimpleAction action, Variant? param) {
-		try {
-			Process.spawn_command_line_async ("system-settings sound");
-		} catch (Error e) {
-			warning ("unable to launch sound settings: %s", e.message);
-		}
+		UrlDispatch.send ("settings://system/sound");
 	}
 
 	/* Returns a serialized version of @icon_name suited for the panel */

=== added file 'vapi/url-dispatcher.vapi'
--- vapi/url-dispatcher.vapi	1970-01-01 00:00:00 +0000
+++ vapi/url-dispatcher.vapi	2013-09-25 21:20:03 +0000
@@ -0,0 +1,9 @@
+[CCode (cprefix="", lower_case_cprefix="", cheader_filename="liburl-dispatcher-1/url-dispatcher.h")]
+
+namespace UrlDispatch
+{
+  public delegate void DispatchCallback ();
+
+  [CCode (cname = "url_dispatch_send")]
+  public static void send (string url, DispatchCallback? func = null);
+}