diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2013-04-12 14:01:26 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-04-12 14:02:01 +0100 |
| commit | ffa651bd4f4476bf2d734c6931af271e58acb88b (patch) | |
| tree | 12db3d30d587dbaaefd6023f8e651a08058d4b71 /vcl | |
| parent | 694ac8155517a88e7317170b189f9d5fabc270b0 (diff) | |
fix embarassing mess up around gtk+ version detection.
Change-Id: I5a24235f5bb6791f64ba752b01cf185e7a7287cb
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/unx/gtk/app/gtkinst.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx index 1bb4bed482a8..2172a9e764ae 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" ); |