From 327d94ce8054718d0ce157604594e470e90d6cb4 Mon Sep 17 00:00:00 2001
From: Jens Bache-Wiig <jbache@trolltech.com>
Date: Fri, 22 May 2009 15:14:11 +0200
Subject: Fixes a potential crash when changing system palette with QGtkStyle

The problem was that we installed an eventfilter regardless if the
gtk symbols were defined or not. Instead we now initialize and
check for the symbols before we install the filter.

Task-number: 254342
Reviewed-by: ogoffart
---
 src/gui/styles/qgtkstyle.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/gui/styles/qgtkstyle.cpp b/src/gui/styles/qgtkstyle.cpp
index ca71da2..86653df 100644
--- a/src/gui/styles/qgtkstyle.cpp
+++ b/src/gui/styles/qgtkstyle.cpp
@@ -140,10 +140,7 @@ static const char * const dock_widget_restore_xpm[] =
 class QGtkStyleFilter : public QObject
 {
 public:
-    QGtkStyleFilter() {
-        qApp->installEventFilter(this);
-    }
-
+    QGtkStyleFilter() {}
 private:
     bool eventFilter(QObject *obj, QEvent *e);
 };
@@ -167,7 +164,12 @@ class QGtkStylePrivate : public QCleanlooksStylePrivate
 public:
     QGtkStylePrivate()
             : QCleanlooksStylePrivate()
-    {}
+    {
+        QGtk::initGtkWidgets();
+        if (QGtk::isThemeAvailable())
+            qApp->installEventFilter(&filter);
+
+    }
     QGtkStyleFilter filter;
 };
 
@@ -243,7 +245,6 @@ static QString uniqueName(const QString &key, const QStyleOption *option, const
 QGtkStyle::QGtkStyle()
     : QCleanlooksStyle(*new QGtkStylePrivate)
 {
-    QGtk::initGtkWidgets();
 }
 
 /*!
-- 
cgit v0.12