[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/applets/kickoff/core
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2009-07-24 1:24:43
Message-ID: 1248398683.079683.16478.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1001727 by aseigo:

only trigger a change if we're interested in the changes, and without using \
deprecated methods


 M  +3 -3      applicationmodel.cpp  
 M  +1 -1      applicationmodel.h  


--- trunk/KDE/kdebase/workspace/plasma/applets/kickoff/core/applicationmodel.cpp \
#1001726:1001727 @@ -277,7 +277,7 @@
     (void)new KickoffAdaptor(this);
     QDBusConnection::sessionBus().registerObject("/kickoff", this);
     dbus.connect(QString(), "/kickoff", "org.kde.plasma", "reloadMenu", this, \
                SLOT(reloadMenu()));
-    connect(KSycoca::self(), SIGNAL(databaseChanged(const QStringList&)), this, \
SLOT(checkSycocaChange())); +    connect(KSycoca::self(), \
SIGNAL(databaseChanged(QStringList)), this, SLOT(checkSycocaChange(QStringList)));  \
d->fillNode(QString(), d->root);  }
 
@@ -473,9 +473,9 @@
     reset();
 }
 
-void ApplicationModel::checkSycocaChange()
+void ApplicationModel::checkSycocaChange(const QStringList &changes)
 {
-    if (KSycoca::self()->isChanged("services")) {
+    if (changes.contains("services") || changes.contains("apps")) {
         reloadMenu();
     }
 }
--- trunk/KDE/kdebase/workspace/plasma/applets/kickoff/core/applicationmodel.h \
#1001726:1001727 @@ -116,7 +116,7 @@
 
 public slots:
     void reloadMenu();
-    void checkSycocaChange();
+    void checkSycocaChange(const QStringList &changes);
 
 private:
     friend class ApplicationModelPrivate;


[prev in list] [next in list] [prev in thread] [next in thread]