aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/sound_nua.patch
diff options
context:
space:
mode:
authorKen VanDine <ken.vandine@canonical.com>2012-03-16 13:39:31 -0400
committerKen VanDine <ken.vandine@canonical.com>2012-03-16 13:39:31 -0400
commit79dc1a84cb86027b9f031db253a333de4f1ea23f (patch)
tree879bcedc7a33bfed661b9dafcd8b044633dae5a4 /debian/patches/sound_nua.patch
parent083c2f79ff71ab984888b619b28e5109b782b35b (diff)
downloadayatana-indicator-sound-79dc1a84cb86027b9f031db253a333de4f1ea23f.tar.gz
ayatana-indicator-sound-79dc1a84cb86027b9f031db253a333de4f1ea23f.tar.bz2
ayatana-indicator-sound-79dc1a84cb86027b9f031db253a333de4f1ea23f.zip
releasing version 0.8.3.0-0ubuntu2
Diffstat (limited to 'debian/patches/sound_nua.patch')
-rw-r--r--debian/patches/sound_nua.patch21
1 files changed, 17 insertions, 4 deletions
diff --git a/debian/patches/sound_nua.patch b/debian/patches/sound_nua.patch
index 4b31b61..97ba41b 100644
--- a/debian/patches/sound_nua.patch
+++ b/debian/patches/sound_nua.patch
@@ -1,13 +1,26 @@
=== modified file 'src/sound-service-dbus.c'
---- old/src/sound-service-dbus.c 2011-08-10 16:58:49 +0000
-+++ new/src/sound-service-dbus.c 2012-02-09 21:32:58 +0000
-@@ -228,7 +228,7 @@
+--- old/src/sound-service-dbus.c 2012-03-02 16:34:50 +0000
++++ new/src/sound-service-dbus.c 2012-03-16 17:24:56 +0000
+@@ -228,13 +228,20 @@
+ gpointer user_data)
{
GError * error = NULL;
++ gchar* cmd;
++ if (!g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "Unity"))
++ cmd = "gnome-control-center sound-nua";
++ else
++ cmd = "gnome-control-center sound";
++
if (!g_spawn_command_line_async("gnome-volume-control --page=applications", &error) &&
- !g_spawn_command_line_async("gnome-control-center sound", &error) &&
-+ !g_spawn_command_line_async("gnome-control-center sound-nua", &error) &&
++ !g_spawn_command_line_async(cmd, &error) &&
!g_spawn_command_line_async("xfce4-mixer", &error))
{
g_warning("Unable to show dialog: %s", error->message);
+ g_error_free(error);
+ }
++ g_free (cmd);
+ }
+
+ static void