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

[Caolán McNamara]

 vcl/unx/gtk/gtkinst.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 53bd86e0965d0a80f84a5528e040e4c050c607b0
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Nov 10 12:41:45 2016 +0000

    Resolves: tdf#103815 Revert "use same GtkInstance::AnyInput impl"
    
    cause of the reported regression, it seems extradinary that this
    would cause that, but it seems to be the case and I have no interest
    in debugging the undebuggable scheduler.
    
    This reverts commit 180a0eac238ce456771ff20b8d3274b43408f54c.

diff --git a/vcl/unx/gtk/gtkinst.cxx b/vcl/unx/gtk/gtkinst.cxx
index 9a535f0..14bd71d 100644
--- a/vcl/unx/gtk/gtkinst.cxx
+++ b/vcl/unx/gtk/gtkinst.cxx
@@ -119,6 +119,7 @@ extern "C"
     }
 }
 
+#if GTK_CHECK_VERSION(3,0,0)
 static VclInputFlags categorizeEvent(const GdkEvent *pEvent)
 {
     VclInputFlags nType = VclInputFlags::NONE;
@@ -147,6 +148,7 @@ static VclInputFlags categorizeEvent(const GdkEvent *pEvent)
     }
     return nType;
 }
+#endif
 
 GtkInstance::GtkInstance( SalYieldMutex* pMutex )
 #if GTK_CHECK_VERSION(3,0,0)
@@ -439,6 +441,9 @@ bool GtkInstance::AnyInput( VclInputFlags nType )
     EnsureInit();
     if( (nType & VclInputFlags::TIMER) && IsTimerExpired() )
         return true;
+#if !GTK_CHECK_VERSION(3,0,0)
+    bool bRet = X11SalInstance::AnyInput(nType);
+#else
     if (!gdk_events_pending())
         return false;
 
@@ -466,6 +471,7 @@ bool GtkInstance::AnyInput( VclInputFlags nType )
         gdk_event_free(pEvent);
         aEvents.pop();
     }
+#endif
     return bRet;
 }