Remove upstreamed fix-update-scripts

epel9
Dan Vrátil 10 years ago
parent 15354d0e4c
commit 1f7b184491

@ -1,32 +0,0 @@
diff --git a/shell/scripting/scriptengine.cpp b/shell/scripting/scriptengine.cpp
index 9a916af..c4c60a1 100644
--- a/shell/scripting/scriptengine.cpp
+++ b/shell/scripting/scriptengine.cpp
@@ -875,7 +875,7 @@ QStringList ScriptEngine::pendingUpdateScripts(Plasma::Corona *corona)
const QString appName = corona->package().metadata().pluginName();
QStringList scripts;
- const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, appName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory);
+ const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "plasma/shells/" + appName + QStringLiteral("/updates"), QStandardPaths::LocateDirectory);
Q_FOREACH(const QString& dir, dirs) {
QDirIterator it(dir, QStringList() << QStringLiteral("*.js"));
while (it.hasNext()) {
diff --git a/shell/shellcorona.cpp b/shell/shellcorona.cpp
index 9f190d6..9c9d52c 100644
--- a/shell/shellcorona.cpp
+++ b/shell/shellcorona.cpp
@@ -552,7 +552,13 @@ void ShellCorona::processUpdateScripts()
qDebug() << msg;
});
foreach (const QString &script, WorkspaceScripting::ScriptEngine::pendingUpdateScripts(this)) {
- scriptEngine.evaluateScript(script);
+ QFile file(script);
+ if (file.open(QIODevice::ReadOnly | QIODevice::Text) ) {
+ QString code = file.readAll();
+ scriptEngine.evaluateScript(code);
+ } else {
+ qWarning() << "Unable to open the script file" << script << "for reading";
+ }
}
}

@ -23,8 +23,7 @@ Source10: kde
Source11: startkde.cmake Source11: startkde.cmake
## downstream Patches ## downstream Patches
Patch10: fix-update-scripts.patch Patch10: plasma-workspace-5.3.0-konsole-in-contextmenu.patch
Patch11: plasma-workspace-5.3.0-konsole-in-contextmenu.patch
## upstreamable Patches ## upstreamable Patches

Loading…
Cancel
Save