File changeset_ra2bab28a.diff of Package kdebase4-workspace

commit a2bab28a2ce61b8714349665b553cab8d5888fa7
Author: Thomas Lübking <thomas.luebking@gmail.com>
Date:   Tue Jul 2 23:06:06 2013 +0200

    don't query effects threaded
    
    calls sycoca/kconfiggroup...
    
    BUG: 321576
    FIXED-IN: 4.11
    REVIEW: 111374

diff --git a/kwin/effects.cpp b/kwin/effects.cpp
index 11781d6..da48338 100644
--- a/kwin/effects.cpp
+++ b/kwin/effects.cpp
@@ -186,8 +186,8 @@ void EffectsHandlerImpl::reconfigure()
     QFutureWatcher<KService::List> *watcher = new QFutureWatcher<KService::List>(this);
     connect(watcher, SIGNAL(finished()), this, SLOT(slotEffectsQueried()));
     watcher->setFuture(QtConcurrent::run(KServiceTypeTrader::self(), &KServiceTypeTrader::query, QString("KWin/Effect"), QString()));
+    watcher->waitForFinished(); // TODO: remove once KConfigGroup is thread safe, bug #321576
 }
-
 void EffectsHandlerImpl::slotEffectsQueried()
 {
     QFutureWatcher<KService::List> *watcher = dynamic_cast< QFutureWatcher<KService::List>* >(sender());