diff options
| author | Ken VanDine <ken.vandine@canonical.com> | 2012-02-09 11:49:15 -0500 |
|---|---|---|
| committer | Package Import Robot <package-import@ubuntu.com> | 2012-02-09 11:49:15 -0500 |
| commit | c14c51a28751efd19e94acba88016846dd764f86 (patch) | |
| tree | 7ed33e456e05d74a9aaaa506d3476fef71f54657 /src | |
| parent | 8baa6b251b2dcd1591fbdee1de9fe1174d425dcd (diff) | |
| parent | 46ce85550e1349998561f82146a3828cc94e311e (diff) | |
| download | ayatana-indicator-sound-c14c51a28751efd19e94acba88016846dd764f86.tar.gz ayatana-indicator-sound-c14c51a28751efd19e94acba88016846dd764f86.tar.bz2 ayatana-indicator-sound-c14c51a28751efd19e94acba88016846dd764f86.zip | |
* debian/patches/sound_nua.patch
- open the new sound-nua panel in gnome-control-center
* debian/patches/dbusmenu_05_90.patch
- fixed FTBFS with dbusmenu 0.5.90
* debian/control
- bump build depends for dbusmenu to >= 0.5.90
Diffstat (limited to 'src')
| -rw-r--r-- | src/indicator-sound.c | 4 | ||||
| -rw-r--r-- | src/metadata-widget.h | 4 | ||||
| -rw-r--r-- | src/mute-widget.h | 4 | ||||
| -rw-r--r-- | src/sound-service-dbus.c | 2 | ||||
| -rw-r--r-- | src/transport-widget.h | 4 | ||||
| -rw-r--r-- | src/voip-input-widget.h | 4 | ||||
| -rw-r--r-- | src/volume-widget.h | 4 |
7 files changed, 1 insertions, 25 deletions
diff --git a/src/indicator-sound.c b/src/indicator-sound.c index b953449..9c8cff7 100644 --- a/src/indicator-sound.c +++ b/src/indicator-sound.c @@ -23,11 +23,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include <glib/gi18n.h> #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> -#if GTK_CHECK_VERSION(3, 0, 0) -#include <libdbusmenu-gtk3/menu.h> -#else #include <libdbusmenu-gtk/menu.h> -#endif #include <libido/idoscalemenuitem.h> #include <gio/gio.h> diff --git a/src/metadata-widget.h b/src/metadata-widget.h index b0123a3..fc6944e 100644 --- a/src/metadata-widget.h +++ b/src/metadata-widget.h @@ -20,11 +20,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #define __METADATA_WIDGET_H__ #include <gtk/gtk.h> -#if GTK_CHECK_VERSION(3, 0, 0) -#include <libdbusmenu-gtk3/menuitem.h> -#else #include <libdbusmenu-gtk/menuitem.h> -#endif G_BEGIN_DECLS diff --git a/src/mute-widget.h b/src/mute-widget.h index 95130a1..88ddd41 100644 --- a/src/mute-widget.h +++ b/src/mute-widget.h @@ -22,11 +22,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include <glib.h> #include <glib-object.h> #include <gtk/gtk.h> -#if GTK_CHECK_VERSION(3, 0, 0) -#include <libdbusmenu-gtk3/menuitem.h> -#else #include <libdbusmenu-gtk/menuitem.h> -#endif #include <libindicator/indicator-object.h> G_BEGIN_DECLS diff --git a/src/sound-service-dbus.c b/src/sound-service-dbus.c index b69f081..899fee8 100644 --- a/src/sound-service-dbus.c +++ b/src/sound-service-dbus.c @@ -228,7 +228,7 @@ show_sound_settings_dialog (DbusmenuMenuitem *mi, { GError * error = NULL; 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("xfce4-mixer", &error)) { g_warning("Unable to show dialog: %s", error->message); diff --git a/src/transport-widget.h b/src/transport-widget.h index 8c2ce48..b68845f 100644 --- a/src/transport-widget.h +++ b/src/transport-widget.h @@ -20,11 +20,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #define __TRANSPORT_WIDGET_H__ #include <gtk/gtk.h> -#if GTK_CHECK_VERSION(3, 0, 0) -#include <libdbusmenu-gtk3/menuitem.h> -#else #include <libdbusmenu-gtk/menuitem.h> -#endif #include "common-defs.h" diff --git a/src/voip-input-widget.h b/src/voip-input-widget.h index 0e90665..72da80c 100644 --- a/src/voip-input-widget.h +++ b/src/voip-input-widget.h @@ -22,11 +22,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include <glib.h> #include <glib-object.h> #include <gtk/gtk.h> -#if GTK_CHECK_VERSION(3, 0, 0) -#include <libdbusmenu-gtk3/menuitem.h> -#else #include <libdbusmenu-gtk/menuitem.h> -#endif G_BEGIN_DECLS diff --git a/src/volume-widget.h b/src/volume-widget.h index 3deb99c..665f39b 100644 --- a/src/volume-widget.h +++ b/src/volume-widget.h @@ -22,11 +22,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include <glib.h> #include <glib-object.h> #include <gtk/gtk.h> -#if GTK_CHECK_VERSION(3, 0, 0) -#include <libdbusmenu-gtk3/menuitem.h> -#else #include <libdbusmenu-gtk/menuitem.h> -#endif #include <libindicator/indicator-object.h> G_BEGIN_DECLS |