From f27dca81badb40b5e40d086660da1efeb09e4c58 Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Thu, 14 Jul 2016 11:00:30 +0200
Subject: [PATCH] don't try to recycle activities

that was a bad idea.
the idea was "is there an activity that doesn't
have a containment"? use that
but if an activity oesn't have a containment something else
went already wrong
---
 shell/scripting/scriptengine.cpp | 33 ++++++++------------------------
 1 file changed, 8 insertions(+), 25 deletions(-)

diff --git a/shell/scripting/scriptengine.cpp b/shell/scripting/scriptengine.cpp
index bd21a2bbc..bef0c04dd 100644
--- a/shell/scripting/scriptengine.cpp
+++ b/shell/scripting/scriptengine.cpp
@@ -177,34 +177,17 @@ QScriptValue ScriptEngine::createActivity(QScriptContext *context, QScriptEngine
 
     KActivities::Controller controller;
 
-    QString id;
-
-    QSet <QString> knownActivities;
-    foreach (Plasma::Containment *cont, env->m_corona->containments()) {
-        knownActivities.insert(cont->activity());
-    }
-
-    foreach (const QString &act, controller.activities()) {
-        if (!knownActivities.contains(act)) {
-            id = act;
-        }
-    }
-
-    if (id.isEmpty()) {
-        //TODO: if there are activities without containment, recycle
-        QFuture<QString> futureId = controller.addActivity(name);
-        QEventLoop loop;
+    //TODO: if there are activities without containment, recycle
+    QFuture<QString> futureId = controller.addActivity(name);
+    QEventLoop loop;
 
-        QFutureWatcher<QString> *watcher = new QFutureWatcher<QString>();
-        connect(watcher, &QFutureWatcherBase::finished, &loop, &QEventLoop::quit);
+    QFutureWatcher<QString> *watcher = new QFutureWatcher<QString>();
+    connect(watcher, &QFutureWatcherBase::finished, &loop, &QEventLoop::quit);
 
-        watcher->setFuture(futureId);
+    watcher->setFuture(futureId);
 
-        loop.exec();
-        id = futureId.result();
-    } else {
-        controller.setActivityName(id, name);
-    }
+    loop.exec();
+    QString id = futureId.result();
 
     Activity *a = new Activity(id, env->m_corona);