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

List:       kde-commits
Subject:    =?utf-8?q?=5Bshare-like-connect=5D_dataengine=3A_return_an_hash_?=
From:       Marco Martin <notmart () gmail ! com>
Date:       2011-05-31 22:35:51
Message-ID: 20110531223551.5655DA60A9 () git ! kde ! org
[Download RAW message or body]

Git commit e1cacfb1bc8d3b09b9aa31e8c5ed8e0910c5b077 by Marco Martin.
Committed on 01/06/2011 at 00:34.
Pushed by mart into branch 'master'.

return an hash with all activities if no targets

M  +4    -1    dataengine/providers/activities/activitiesProvider.cpp     
M  +2    -2    dataengine/slcservice/slcjob.cpp     

http://commits.kde.org/share-like-connect/e1cacfb1bc8d3b09b9aa31e8c5ed8e0910c5b077

diff --git a/dataengine/providers/activities/activitiesProvider.cpp \
b/dataengine/providers/activities/activitiesProvider.cpp index b0a9892..1b5da74 \
                100644
--- a/dataengine/providers/activities/activitiesProvider.cpp
+++ b/dataengine/providers/activities/activitiesProvider.cpp
@@ -56,7 +56,10 @@ QVariant ActivitiesProvider::executeAction(SLC::Provider::Action \
action, const Q  //TODO: first step
         QVariantHash result;
         foreach (const QString &activity, m_activityConsumer->listActivities()) {
-            result[activity] = activity;
+            KActivityInfo *info = new KActivityInfo(activity);
+            result[activity] = info->name();
+            //kDebug() << "Found activity: " << activity << info->name();
+            delete info;
         }
         return result;
     }
diff --git a/dataengine/slcservice/slcjob.cpp b/dataengine/slcservice/slcjob.cpp
index 8a57069..8f94679 100644
--- a/dataengine/slcservice/slcjob.cpp
+++ b/dataengine/slcservice/slcjob.cpp
@@ -51,8 +51,8 @@ void SlcJob::start()
         providerParameters["URI"] = m_content["URI"];
         providerParameters["Comment"] = parameters()["Comment"];
         providerParameters["Target"] = parameters()["Target"];
-        QVariant success = m_provider.data()->executeAction(SLC::Provider::Connect, \
                QVariantHash(), providerParameters);
-        setResult(success);
+        QVariant result = m_provider.data()->executeAction(SLC::Provider::Connect, \
QVariantHash(), providerParameters); +        setResult(result);
         return;
     }
     setResult(false);


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