From dfd591aa736eb621dad82f5dac8ab11c01818874 Mon Sep 17 00:00:00 2001
From: "Aaron J. Seigo" <aseigo@kde.org>
Date: Mon, 25 May 2009 20:02:29 +0000
Subject: [PATCH] we only care about config file changes in teh case of the
 default theme; all other themes are on their own on this one

svn path=/trunk/KDE/kdelibs/; revision=972838
---
 theme.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/theme.cpp b/theme.cpp
index 4717ada30..59199ff8f 100644
--- a/theme.cpp
+++ b/theme.cpp
@@ -84,11 +84,6 @@ public:
             QObject::connect(compositeWatch, SIGNAL(lostOwner()), q, SLOT(compositingChanged()));
         }
 #endif
-
-        //FIXME: if/when kconfig gets change notification, this will be unecessary
-        KDirWatch::self()->addFile(KStandardDirs::locateLocal("config", ThemePrivate::themeRcFile));
-        QObject::connect(KDirWatch::self(), SIGNAL(created(QString)), q, SLOT(settingsFileChanged(QString)));
-        QObject::connect(KDirWatch::self(), SIGNAL(dirty(QString)), q, SLOT(settingsFileChanged(QString)));
     }
 
     ~ThemePrivate()
@@ -249,6 +244,11 @@ public:
     ThemeSingleton()
     {
         self.d->isDefault = true;
+
+        //FIXME: if/when kconfig gets change notification, this will be unecessary
+        KDirWatch::self()->addFile(KStandardDirs::locateLocal("config", ThemePrivate::themeRcFile));
+        QObject::connect(KDirWatch::self(), SIGNAL(created(QString)), &self, SLOT(settingsFileChanged(QString)));
+        QObject::connect(KDirWatch::self(), SIGNAL(dirty(QString)), &self, SLOT(settingsFileChanged(QString)));
     }
 
    Theme self;
@@ -309,7 +309,6 @@ KPluginInfo::List Theme::listThemeInfo()
 
 void ThemePrivate::settingsFileChanged(const QString &file)
 {
-    kDebug() << file;
     if (file.endsWith(themeRcFile)) {
         config().config()->reparseConfiguration();
         q->settingsChanged();