glib / dbus version checks strangely ommitted from the merge.

vcl/inc/unx/gtk/gtkframe.hxx

@@ -213,7 +213,8 @@ class GtkSalFrame : public SalFrame
 #endif
 
     SalMenu*                        m_pSalMenu;
-#ifdef ENABLE_DBUS
+
+#if defined(ENABLE_DBUS) && defined(ENABLE_GIO)
     friend void ensure_dbus_setup(GdkWindow* gdkWindow, GtkSalFrame* pSalFrame);
     friend void on_registrar_available (GDBusConnection*, const gchar*, const gchar*, gpointer);
     friend void on_registrar_unavailable (GDBusConnection*, const gchar*, gpointer);

vcl/inc/unx/gtk/gtksalmenu.hxx

@@ -17,16 +17,16 @@
 #include <unx/gtk/gtkframe.hxx>
 
 #if defined(ENABLE_DBUS) && defined(ENABLE_GIO)
-#  ifdef GLIB_AVAILABLE_IN_2_32
+#  if GLIB_MAJOR_VERSION > 2 && GLIB_MINOR_VERSION >= 32
 #    define ENABLE_GMENU_INTEGRATION
 #  endif
 #  include <unx/gtk/glomenu.h>
 #  include <unx/gtk/gloactiongroup.h>
 #else
-#  ifndef GLIB_AVAILABLE_IN_2_32
+#  if GLIB_MAJOR_VERSION > 2 && GLIB_MINOR_VERSION >= 32
      typedef void GMenuModel;
 #  endif
-#  if !GLIB_CHECK_VERSION(2,28,0)
+#  if GLIB_MAJOR_VERSION > 2 && GLIB_MINOR_VERSION >= 28
      typedef void GActionGroup;
 #  endif
 #endif

vcl/unx/gtk/window/gtkframe.cxx

@@ -481,12 +481,14 @@ GtkSalFrame::GtkSalFrame( SystemParentData* pSysData )
     Init( pSysData );
 }
 
-#if !GTK_CHECK_VERSION(3,0,0) && defined(ENABLE_DBUS) && defined(ENABLE_GIO)
+#ifdef ENABLE_GMENU_INTEGRATION
+
 static void
 gdk_x11_window_set_utf8_property  (GdkWindow *window,
                                    const gchar *name,
                                    const gchar *value)
 {
+#if !GTK_CHECK_VERSION(3,0,0)
   GdkDisplay* display = gdk_window_get_display (window);
 
   if (value != NULL)
@@ -503,12 +505,11 @@ gdk_x11_window_set_utf8_property  (GdkWindow *window,
                        GDK_WINDOW_XID (window),
                        gdk_x11_get_xatom_by_name_for_display (display, name));
     }
-}
 #endif
+}
 
 // AppMenu watch functions.
 
-#ifdef ENABLE_GMENU_INTEGRATION
 static void ObjectDestroyedNotify( gpointer data )
 {
     if ( data ) {
@@ -1135,7 +1136,7 @@ void GtkSalFrame::Init( SalFrame* pParent, sal_uLong nStyle )
 #if !GTK_CHECK_VERSION(3,0,0)
     if( eWinType == GTK_WINDOW_TOPLEVEL )
     {
-#if defined(ENABLE_DBUS) && defined(ENABLE_GIO)
+#ifdef ENABLE_GMENU_INTEGRATION
         // Enable DBus native menu if available.
         ensure_dbus_setup( this );
 #endif