* always set up a job to run when an operation call is made, even if it fails

* call emitResult() from setResult

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=856872

private/service_p.h

@@ -37,8 +37,8 @@ class ConfigXml;
 class NullServiceJob : public ServiceJob
 {
 public:
-    NullServiceJob(QObject *parent)
-        : ServiceJob(QString(), QString(), QMap<QString, QVariant>(), parent)
+    NullServiceJob(const QString &destination, const QString &operation, QObject *parent)
+        : ServiceJob(destination, operation, QMap<QString, QVariant>(), parent)
     {
     }
 
@@ -59,9 +59,9 @@ public:
         setName("NullService");
     }
 
-    ServiceJob *createJob(const QString &, QMap<QString, QVariant> &)
+    ServiceJob *createJob(const QString &operation, QMap<QString, QVariant> &)
     {
-        return new NullServiceJob(parent());
+        return new NullServiceJob(destination(), operation, this);
     }
 };
 

service.cpp

@@ -133,17 +133,14 @@ KConfigGroup Service::operationDescription(const QString &operationName)
 ServiceJob* Service::startOperationCall(const KConfigGroup &description)
 {
     // TODO: nested groups?
+    ServiceJob *job = 0;
+    QString op = description.name();
     if (!d->config) {
         kDebug() << "No valid operations scheme has been registered";
-        return new NullServiceJob(parent());
-    }
-
-    QString op = description.name();
+    } else {
         if (d->disabledOperations.contains(op)) {
             kDebug() << "Operation" << op << "is disabled";
-        return new NullServiceJob(parent());
-    }
-
+        } else {
             d->config->writeConfig();
             QMap<QString, QVariant> params;
             foreach (const QString &key, description.keyList()) {
@@ -153,7 +150,14 @@ ServiceJob* Service::startOperationCall(const KConfigGroup &description)
                 }
             }
 
-    ServiceJob *job = createJob(description.name(), params);
+            job = createJob(description.name(), params);
+        }
+    }
+
+    if (!job) {
+        job = new NullServiceJob(destination(), op, this);
+    }
+
     connect(job, SIGNAL(finished(KJob*)), this, SLOT(jobFinished(KJob*)));
     QTimer::singleShot(0, job, SLOT(slotStart()));
     return job;

servicejob.cpp

@@ -83,6 +83,7 @@ QVariant ServiceJob::result() const
 void ServiceJob::setResult(const QVariant &result)
 {
     d->result = result;
+    emitResult();
 }
 
 void ServiceJob::start()