diff options
| author | Ted Gould <ted@gould.cx> | 2012-02-03 12:16:30 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2012-02-03 12:16:30 -0600 |
| commit | 48aab89afbc238f3b8f4b62f0423604ebe0cec0a (patch) | |
| tree | 1f273d6acd46448f652bbe1195a5548000dac82d | |
| parent | 8b2ab5bfbc1b40dde9db2fcdb1074221f42125f0 (diff) | |
| parent | 1651821c9c51c3d26afce0dae583fc93fbf03cbb (diff) | |
| download | ayatana-indicator-sound-48aab89afbc238f3b8f4b62f0423604ebe0cec0a.tar.gz ayatana-indicator-sound-48aab89afbc238f3b8f4b62f0423604ebe0cec0a.tar.bz2 ayatana-indicator-sound-48aab89afbc238f3b8f4b62f0423604ebe0cec0a.zip | |
Updating to dbusmenu 0.5.90
| -rw-r--r-- | configure.ac | 2 | ||||
| -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/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/configure.ac b/configure.ac index 22fffa1..6b78c34 100644 --- a/configure.ac +++ b/configure.ac @@ -42,7 +42,7 @@ AC_ARG_WITH([gtk], GTK_REQUIRED_VERSION=2.22 GTK3_REQUIRED_VERSION=3.0 INDICATOR_REQUIRED_VERSION=0.3.19 -DBUSMENUGTK_REQUIRED_VERSION=0.3.101 +DBUSMENUGTK_REQUIRED_VERSION=0.5.90 POLKIT_REQUIRED_VERSION=0.92 PULSE_AUDIO_REQUIRED_VERSION=0.9.19 INDICATOR_DISPLAY_OBJECTS=0.1.11 diff --git a/src/indicator-sound.c b/src/indicator-sound.c index c87f850..243e759 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/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 |