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

[Bjoern Michaelsen]

 vcl/unx/gtk/app/gtkdata.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit bfab2004b38f10706d1d2c5b69f68a0bca93bb4c
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Wed Oct 14 19:00:46 2015 +0100

    fix build against glib < 2.36 (w/o gmenu) again
    
    Change-Id: I01a76e0cf19e11609a2f414bf754f3034b298b2d

diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index 7c2db5e..6dc0cbf 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.cxx
@@ -1021,6 +1021,7 @@ void GtkSalDisplay::deregisterFrame( SalFrame* pFrame )
 #if GTK_CHECK_VERSION(3,0,0)
 void GtkSalDisplay::RefreshMenusUnity()
 {
+#ifdef ENABLE_GMENU_INTEGRATION
     for(auto pSalFrame : m_aFrames) {
         auto pGtkSalFrame( static_cast<GtkSalFrame*>(pSalFrame));
         GtkSalMenu* pSalMenu = static_cast<GtkSalMenu*>(pGtkSalFrame->GetMenu());
@@ -1029,7 +1030,7 @@ void GtkSalDisplay::RefreshMenusUnity()
             pSalMenu->UpdateFull();
         }
     }
-
+#endif
 }
 #endif