diff options
| author | Ted Gould <ted@gould.cx> | 2012-02-03 12:17:23 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2012-02-03 12:17:23 -0600 |
| commit | 5ae829c79f7bbb889f4876732b96469de5eaf01b (patch) | |
| tree | 3a6cd41a08b7ba6bb40da8dbf784ea75b342b9a8 | |
| parent | 77699eb5a22ed5da6b008368486121e9ef7fc4e0 (diff) | |
| parent | ab073d8e5adf1b6771f5d9e5f4b8aaf20800b604 (diff) | |
| download | ayatana-indicator-session-5ae829c79f7bbb889f4876732b96469de5eaf01b.tar.gz ayatana-indicator-session-5ae829c79f7bbb889f4876732b96469de5eaf01b.tar.bz2 ayatana-indicator-session-5ae829c79f7bbb889f4876732b96469de5eaf01b.zip | |
Updating to dbusmenu 0.5.90
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/apt-watcher.h | 4 | ||||
| -rw-r--r-- | src/device-menu-mgr.c | 1 | ||||
| -rw-r--r-- | src/indicator-session.c | 4 | ||||
| -rw-r--r-- | src/session-service.c | 4 | ||||
| -rw-r--r-- | src/udev-mgr.h | 4 | ||||
| -rw-r--r-- | src/user-menu-mgr.h | 2 | ||||
| -rw-r--r-- | src/user-widget.h | 4 |
8 files changed, 2 insertions, 23 deletions
diff --git a/configure.ac b/configure.ac index d47d754..3e5fa97 100644 --- a/configure.ac +++ b/configure.ac @@ -30,7 +30,7 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) GTK_REQUIRED_VERSION=2.12 GTK3_REQUIRED_VERSION=3.0 INDICATOR_REQUIRED_VERSION=0.3.19 -DBUSMENUGTK_REQUIRED_VERSION=0.4.92 +DBUSMENUGTK_REQUIRED_VERSION=0.5.90 POLKIT_REQUIRED_VERSION=0.92 AC_ARG_WITH([gtk], diff --git a/src/apt-watcher.h b/src/apt-watcher.h index 7b98a44..6b7d5e1 100644 --- a/src/apt-watcher.h +++ b/src/apt-watcher.h @@ -25,11 +25,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include <libdbusmenu-glib/client.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 "session-dbus.h" diff --git a/src/device-menu-mgr.c b/src/device-menu-mgr.c index 3858564..6ce5962 100644 --- a/src/device-menu-mgr.c +++ b/src/device-menu-mgr.c @@ -19,7 +19,6 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include <config.h> #include <libdbusmenu-glib/client.h> -#include <libdbusmenu-gtk3/menuitem.h> #include "device-menu-mgr.h" #include "settings-helper.h" diff --git a/src/indicator-session.c b/src/indicator-session.c index ec49f0e..bd7bcd3 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -31,11 +31,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include <gtk/gtk.h> #include <gio/gio.h> -#if GTK_CHECK_VERSION(3, 0, 0) -#include <libdbusmenu-gtk3/menu.h> -#else #include <libdbusmenu-gtk/menu.h> -#endif #include <libindicator/indicator.h> #include <libindicator/indicator-object.h> diff --git a/src/session-service.c b/src/session-service.c index 753e304..6ee18e9 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -39,11 +39,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include <libdbusmenu-glib/client.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-service.h> diff --git a/src/udev-mgr.h b/src/udev-mgr.h index 5119803..2e57cff 100644 --- a/src/udev-mgr.h +++ b/src/udev-mgr.h @@ -24,11 +24,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include <libdbusmenu-glib/client.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/user-menu-mgr.h b/src/user-menu-mgr.h index 01823e7..40f7b18 100644 --- a/src/user-menu-mgr.h +++ b/src/user-menu-mgr.h @@ -23,7 +23,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include <glib-object.h> -#include <libdbusmenu-gtk3/menuitem.h> +#include <libdbusmenu-gtk/menuitem.h> #include "session-dbus.h" diff --git a/src/user-widget.h b/src/user-widget.h index e1f6d1a..52a5e34 100644 --- a/src/user-widget.h +++ b/src/user-widget.h @@ -20,11 +20,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #define __USER_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 |