[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/unx

[Caolán McNamara]

 vcl/unx/gtk/fpicker/SalGtkPicker.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 5d89d4e45bc01119032944ce8b147e9cb682e25d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jun 29 21:05:22 2015 +0100

    can't make the gtk3 dialogs modal for some reason, workaround the auto-popdown
    
    Change-Id: I280408bae5d9c15c6bbc7da5f3e4ec8dd20757e8
    (cherry picked from commit 1ca05e1ad6f7377a7e29ec5d74533a2d7170a628)

diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
index 3069c2a..1e07d9a 100644
--- a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
@@ -136,8 +136,12 @@ RunDialog::~RunDialog()
 void SAL_CALL RunDialog::windowOpened( const ::com::sun::star::lang::EventObject& )
     throw (::com::sun::star::uno::RuntimeException, std::exception)
 {
+#if !GTK_CHECK_VERSION(3,0,0)
     SolarMutexGuard g;
     g_timeout_add_full(G_PRIORITY_HIGH_IDLE, 0, reinterpret_cast<GSourceFunc>(canceldialog), this, NULL);
+#else
+    SAL_WARN( "vcl", "ignoring windowOpened, because gtk3 dialog is probably not modal as expected and a tooltip was triggered" );
+#endif
 }
 
 void SAL_CALL RunDialog::queryTermination( const ::com::sun::star::lang::EventObject& )