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

Caolán McNamara caolanm at redhat.com
Tue Jun 30 08:55:57 PDT 2015


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

New commits:
commit f82e6424075cbc5f4a3766f5f6e28314c249f3f0
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jun 30 16:48:34 2015 +0100

    only try gtk3 vclplug on >= 3.14
    
    themeing has changed around quite a bit, and there's insufficient interest to
    get older versions looking right
    
    Change-Id: Ia2ee58d66c859e3bf00b54413fac1efb00d38dd3

diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx
index d31563e..41dfbea 100644
--- a/vcl/unx/gtk/app/gtkinst.cxx
+++ b/vcl/unx/gtk/app/gtkinst.cxx
@@ -82,6 +82,12 @@ extern "C"
             XInitThreads();
 
 #if GTK_CHECK_VERSION(3,0,0)
+        if (gtk_minor_version < 14)
+        {
+            g_warning("require a newer gtk than 3.%d for theme expectations", gtk_minor_version);
+            return NULL;
+        }
+
         const gchar* pVersion = gtk_check_version( 3, 2, 0 );
 #else
         const gchar* pVersion = gtk_check_version( 2, 2, 0 );


More information about the Libreoffice-commits mailing list