diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-11-22 14:12:59 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-11-22 14:14:09 +0100 |
| commit | b91e719f551c83467fcda32dc29f55025db03e09 (patch) | |
| tree | 7f1f0a38c3add7c6b6f23748de640aff190d2f15 /vcl | |
| parent | c9f38e2f0dedfbfbbeb7e901f49b439ba90424e9 (diff) | |
Use ENABLE_GMENU_INTEGRATION consistently
Change-Id: I576bfa41b0dce0cba8c92c123f8747cf619fcffb
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/unx/gtk/gtksalmenu.hxx | 7 | ||||
| -rw-r--r-- | vcl/unx/gtk/window/gtkframe.cxx | 8 |
2 files changed, 8 insertions, 7 deletions
diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx index 5dad08596dd6..cdd29f98fc9a 100644 --- a/vcl/inc/unx/gtk/gtksalmenu.hxx +++ b/vcl/inc/unx/gtk/gtksalmenu.hxx @@ -16,10 +16,9 @@ #include <unx/salmenu.h> #include <unx/gtk/gtkframe.hxx> -#if defined(ENABLE_DBUS) && defined(ENABLE_GIO) -# if GLIB_MAJOR_VERSION > 2 || GLIB_MINOR_VERSION >= 32 -# define ENABLE_GMENU_INTEGRATION -# endif +#if defined(ENABLE_DBUS) && defined(ENABLE_GIO) && \ + (GLIB_MAJOR_VERSION > 2 || GLIB_MINOR_VERSION >= 32) +# define ENABLE_GMENU_INTEGRATION # include <unx/gtk/glomenu.h> # include <unx/gtk/gloactiongroup.h> #else diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx index fdc729029397..8db1a1d035b4 100644 --- a/vcl/unx/gtk/window/gtkframe.cxx +++ b/vcl/unx/gtk/window/gtkframe.cxx @@ -36,6 +36,8 @@ #endif #if defined(ENABLE_DBUS) && defined(ENABLE_GIO) # include <unx/gtk/gtksalmenu.hxx> +#endif +#if defined ENABLE_GMENU_INTEGRATION // defined in gtksalmenu.hxx above # include <unx/gtk/hudawareness.h> #endif @@ -99,7 +101,7 @@ using namespace com::sun::star; int GtkSalFrame::m_nFloats = 0; -#if defined(ENABLE_DBUS) && defined(ENABLE_GIO) +#if defined ENABLE_GMENU_INTEGRATION static GDBusConnection* pSessionBus = NULL; #endif @@ -688,7 +690,7 @@ GtkSalFrame::~GtkSalFrame() gtk_widget_destroy( GTK_WIDGET( m_pFixedContainer ) ); { SolarMutexGuard aGuard; -#if defined(ENABLE_DBUS) && defined(ENABLE_GIO) +#if defined ENABLE_GMENU_INTEGRATION if(m_nWatcherId) g_bus_unwatch_name(m_nWatcherId); #endif @@ -696,7 +698,7 @@ GtkSalFrame::~GtkSalFrame() { g_object_set_data( G_OBJECT( m_pWindow ), "SalFrame", NULL ); -#if defined(ENABLE_DBUS) && defined(ENABLE_GIO) +#if defined ENABLE_GMENU_INTEGRATION if ( pSessionBus ) { if ( m_nHudAwarenessId ) |