Merge remote branch 'origin/KDE/4.7' into origin-frameworks

dataengine.cpp

@@ -199,7 +199,7 @@ void DataEngine::setData(const QString &source, const QString &key, const QVaria
 
     s->setData(key, value);
 
-    if (isNew) {
+    if (isNew && source != d->waitingSourceRequest) {
         emit sourceAdded(source);
     }
 
@@ -221,7 +221,7 @@ void DataEngine::setData(const QString &source, const Data &data)
         ++it;
     }
 
-    if (isNew) {
+    if (isNew && source != d->waitingSourceRequest) {
         emit sourceAdded(source);
     }
 
@@ -713,6 +713,7 @@ DataContainer *DataEnginePrivate::requestSource(const QString &sourceName, bool
         /*kDebug() << "DataEngine " << q->objectName()
             << ": could not find DataContainer " << sourceName
             << " will create on request" << endl;*/
+        waitingSourceRequest = sourceName;
         if (q->sourceRequestEvent(sourceName)) {
             s = source(sourceName, false);
             if (s) {
@@ -722,8 +723,10 @@ DataContainer *DataEnginePrivate::requestSource(const QString &sourceName, bool
                     *newSource = true;
                 }
                 QObject::connect(s, SIGNAL(becameUnused(QString)), q, SLOT(removeSource(QString)));
+                emit q->sourceAdded(sourceName);
             }
         }
+        waitingSourceRequest.clear();
     }
 
     return s;

private/dataengine_p.h

@@ -118,6 +118,7 @@ class DataEnginePrivate
         QString serviceName;
         Package *package;
         Service *publishedService;
+        QString waitingSourceRequest;
 };
 
 } // Plasma namespace