vcl/unx/gtk/app/gtkinst.cxx | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 8650d6c2e21fe29aee56c9e626395acae0f4a17e
Author: Michael Meeks <michael.me...@suse.com>
Date: Fri Apr 12 14:01:26 2013 +0100
fix embarassing mess up around gtk+ version detection.
Change-Id: I5a24235f5bb6791f64ba752b01cf185e7a7287cb
diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx
index 1bb4bed..2172a9e 100644
--- a/vcl/unx/gtk/app/gtkinst.cxx
+++ b/vcl/unx/gtk/app/gtkinst.cxx
@@ -69,9 +69,13 @@ extern "C"
(int) gtk_major_version, (int) gtk_minor_version,
(int) gtk_micro_version );
#endif
- if( (int) gtk_major_version < 2 || ((int) gtk_major_version == 2 &&
(int) gtk_minor_version < 4))
+ if( gtk_major_version < 2 || // very unlikely sanity check
+ ( gtk_major_version == 2 && gtk_minor_version < 4 ) )
+ {
g_warning("require a newer gtk than %d.%d for
gdk_threads_set_lock_functions", (int) gtk_major_version, gtk_minor_version);
- return NULL;
+ return NULL;
+ }
+
/* #i92121# workaround deadlocks in the X11 implementation
*/
static const char* pNoXInitThreads = getenv( "SAL_NO_XINITTHREADS" );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
