diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-11-14 11:39:53 +0000 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2012-11-14 13:53:02 +0100 |
| commit | dc3ada4db5f6311aaf3154aed0bba17d96c2af9a (patch) | |
| tree | 882e4f70f70eaa4abd3d75c06217b239418dd636 /vcl/inc | |
| parent | e5e55d450d674bdfde6c86992274d8e22f949eb6 (diff) | |
misc dbus menu integration fixes
Re-declare GMenuModel / GActionGroup if we don't have a recent enough gio.
Fix a number of compile warnings.
use the standard gnumake macros / linking for ENABLE_GIO & ENABLE_DBUS
Initialize GDBusInterfaceVTable cleanly.
Take the Solar Mutex on hud_activated.
Change-Id: Ie0c1d6e75c4be857f0db1adad36418dd1693f63e
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/unx/gtk/gtksalmenu.hxx | 15 | ||||
| -rw-r--r-- | vcl/inc/unx/gtk/hudawareness.h | 1 |
2 files changed, 13 insertions, 3 deletions
diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx index 313da5194ce6..05e1af987a86 100644 --- a/vcl/inc/unx/gtk/gtksalmenu.hxx +++ b/vcl/inc/unx/gtk/gtksalmenu.hxx @@ -29,8 +29,19 @@ #include <unx/salmenu.h> #include <unx/gtk/gtkframe.hxx> -#include <unx/gtk/glomenu.h> -#include <unx/gtk/gloactiongroup.h> + +#if defined(ENABLE_DBUS) && defined(ENABLE_GIO) +# define ENABLE_GMENU_INTEGRATION +# include <unx/gtk/glomenu.h> +# include <unx/gtk/gloactiongroup.h> +#else +# ifndef GLIB_AVAILABLE_IN_2_32 + typedef void GMenuModel; +# endif +# ifndef GLIB_AVAILABLE_IN_2_28 + typedef void GActionGroup; +# endif +#endif class MenuItemList; class GtkSalMenuItem; diff --git a/vcl/inc/unx/gtk/hudawareness.h b/vcl/inc/unx/gtk/hudawareness.h index 47c5f902ba5d..7d6b94f5d637 100644 --- a/vcl/inc/unx/gtk/hudawareness.h +++ b/vcl/inc/unx/gtk/hudawareness.h @@ -29,7 +29,6 @@ G_BEGIN_DECLS typedef void (* HudAwarenessCallback) (gboolean hud_active, gpointer user_data); - guint hud_awareness_register (GDBusConnection *connection, const gchar *object_path, HudAwarenessCallback callback, |