diff options
author | Lars Uebernickel <lars.uebernickel@canonical.com> | 2013-06-19 18:40:31 -0400 |
---|---|---|
committer | Lars Uebernickel <lars.uebernickel@canonical.com> | 2013-06-19 18:40:31 -0400 |
commit | 9d78a433b18fd14af4d3cfa01684c32b93f91966 (patch) | |
tree | 50090298c2ddb55dc2fa7c2a3da5a1dce7d699ad /debian/patches/sound_nua.patch | |
parent | a0773c53b13546f4957f2b2ac1f0455fedc05525 (diff) | |
download | ayatana-indicator-sound-9d78a433b18fd14af4d3cfa01684c32b93f91966.tar.gz ayatana-indicator-sound-9d78a433b18fd14af4d3cfa01684c32b93f91966.tar.bz2 ayatana-indicator-sound-9d78a433b18fd14af4d3cfa01684c32b93f91966.zip |
Fold all patches into source
These patches didn't apply to the current source. They added support for sound
settings panels in various desktop environments.
We need a better solution for that, which doesn't require patching the source
when a desktop environment wants a different command line.
Diffstat (limited to 'debian/patches/sound_nua.patch')
-rw-r--r-- | debian/patches/sound_nua.patch | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/debian/patches/sound_nua.patch b/debian/patches/sound_nua.patch deleted file mode 100644 index 869ae24..0000000 --- a/debian/patches/sound_nua.patch +++ /dev/null @@ -1,20 +0,0 @@ -=== modified file 'src/sound-service-dbus.c' ---- old/src/sound-service-dbus.c 2012-03-16 17:59:34 +0000 -+++ new/src/sound-service-dbus.c 2012-03-19 14:54:30 +0000 -@@ -227,8 +227,14 @@ - 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(cmd, &error) && - !g_spawn_command_line_async("xfce4-mixer", &error)) - { - g_warning("Unable to show dialog: %s", error->message); - |