aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2013-09-25 16:07:05 -0500
committerCharles Kerr <charles.kerr@canonical.com>2013-09-25 16:07:05 -0500
commit6621a3d848fd50062f25e95f1787c5084aed0671 (patch)
treebaffafe50bb452e2d207851df93838cada143127
parented998103a6375a780dab4ab273f697c8fcac44d2 (diff)
downloadayatana-indicator-sound-6621a3d848fd50062f25e95f1787c5084aed0671.tar.gz
ayatana-indicator-sound-6621a3d848fd50062f25e95f1787c5084aed0671.tar.bz2
ayatana-indicator-sound-6621a3d848fd50062f25e95f1787c5084aed0671.zip
Use url-dispatcher instead of invoking system-settings directly.
-rw-r--r--CMakeLists.txt4
-rw-r--r--debian/control1
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/service.vala6
4 files changed, 6 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 98dccef..6ab96c9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,11 +25,13 @@ set(SOURCE_BINARY_DIR "${CMAKE_BINARY_DIR}/src")
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})
diff --git a/debian/control b/debian/control
index c639fcb..0d1da18 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Build-Depends: debhelper (>= 9.0),
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,
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a28147d..a61fb72 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -20,6 +20,7 @@ vala_init(indicator-sound-service
--vapidir=${CMAKE_SOURCE_DIR}/vapi/
--vapidir=.
--target-glib=2.36
+ --pkg=url-dispatcher
--pkg=bus-watcher
)
diff --git a/src/service.vala b/src/service.vala
index f43a1a1..c7d4809 100644
--- a/src/service.vala
+++ b/src/service.vala
@@ -108,11 +108,7 @@ public class IndicatorSound.Service {
}
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 */