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

[Bjoern Michaelsen]

 vcl/unx/gtk/window/gtksalframe.cxx |   10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

New commits:
commit 642204067c6217190074a560106b3e238c9d9a73
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Wed Oct 14 18:13:43 2015 +0100

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

diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx
index 1f1bf2c..ebc8516 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -1449,7 +1449,6 @@ void GtkSalFrame::Init( SalFrame* pParent, SalFrameStyleFlags nStyle )
 
     InitCommon();
 
-#if !GTK_CHECK_VERSION(3,0,0)
     if( eWinType == GTK_WINDOW_TOPLEVEL )
     {
 #ifdef ENABLE_GMENU_INTEGRATION
@@ -1457,20 +1456,15 @@ void GtkSalFrame::Init( SalFrame* pParent, SalFrameStyleFlags nStyle )
         ensure_dbus_setup( this );
 #endif
 
+#if !GTK_CHECK_VERSION(3,0,0)
         guint32 nUserTime = 0;
         if( (nStyle & (SalFrameStyleFlags::OWNERDRAWDECORATION|SalFrameStyleFlags::TOOLWINDOW)) == SalFrameStyleFlags::NONE )
         {
             nUserTime = gdk_x11_get_server_time(GTK_WIDGET (m_pWindow)->window);
         }
         lcl_set_user_time(GTK_WINDOW(m_pWindow), nUserTime);
-    }
-#else
-    if( eWinType == GTK_WINDOW_TOPLEVEL )
-    {
-        // Enable DBus native menu if available.
-        ensure_dbus_setup( this );
-    }
 #endif
+    }
 
     if( bDecoHandling )
     {