[Libreoffice-commits] core.git: vcl/inc

Bjoern Michaelsen bjoern.michaelsen at canonical.com
Tue May 21 22:23:57 PDT 2013


 vcl/inc/unx/gtk/gtksalmenu.hxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a0850db02a58f14a7fd778814f2be6ced4433022
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Wed May 22 07:22:33 2013 +0200

    fdo#63840 lp#1182082: disable internal unity integration against glib<2.36
    
    * that is: use internal unity integration from Ubuntu 13.04 raring
      upwards only
    
    Change-Id: I08b9d950245b21e8d92c1e76905d53e97afdf685

diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx
index d161c61..89c1af0 100644
--- a/vcl/inc/unx/gtk/gtksalmenu.hxx
+++ b/vcl/inc/unx/gtk/gtksalmenu.hxx
@@ -19,7 +19,7 @@
 #include <unx/gtk/gtkframe.hxx>
 
 #if defined(ENABLE_DBUS) && defined(ENABLE_GIO) && \
-    (GLIB_MAJOR_VERSION > 2 || GLIB_MINOR_VERSION >= 32)
+    (GLIB_MAJOR_VERSION > 2 || GLIB_MINOR_VERSION >= 36)
 #  define ENABLE_GMENU_INTEGRATION
 #  include <unx/gtk/glomenu.h>
 #  include <unx/gtk/gloactiongroup.h>


More information about the Libreoffice-commits mailing list