diff options
author | Michael Palimaka <kensington@gentoo.org> | 2016-05-25 19:53:51 +1000 |
---|---|---|
committer | Michael Palimaka <kensington@gentoo.org> | 2016-05-25 19:54:00 +1000 |
commit | c0eb800ec2d6040b6df5f44e8129e9a602537bff (patch) | |
tree | 9ebb163bfe5c8ac372549d272a5244b77977532b /kde-frameworks | |
parent | kde-apps/kde-apps-meta: remove old revision (diff) | |
download | gentoo-c0eb800ec2d6040b6df5f44e8129e9a602537bff.tar.gz gentoo-c0eb800ec2d6040b6df5f44e8129e9a602537bff.tar.bz2 gentoo-c0eb800ec2d6040b6df5f44e8129e9a602537bff.zip |
kde-frameworks/kactivities: remove unused patch
Package-Manager: portage-2.3.0_rc1
Diffstat (limited to 'kde-frameworks')
-rw-r--r-- | kde-frameworks/kactivities/files/kactivities-5.19.0-crash.patch | 89 |
1 files changed, 0 insertions, 89 deletions
diff --git a/kde-frameworks/kactivities/files/kactivities-5.19.0-crash.patch b/kde-frameworks/kactivities/files/kactivities-5.19.0-crash.patch deleted file mode 100644 index 001fbb26ea4c..000000000000 --- a/kde-frameworks/kactivities/files/kactivities-5.19.0-crash.patch +++ /dev/null @@ -1,89 +0,0 @@ -From b3c8ad1ad48d65ea77724f94073909dc8ab97596 Mon Sep 17 00:00:00 2001 -From: David Edmundson <david@davidedmundson.co.uk> -Date: Sat, 6 Feb 2016 18:02:53 +0000 -Subject: [PATCH] Fix crash in activities context menu - -Currently we call deleteLater() from inside ::run which is running in a -different thread than the receiving object. -(QThread objects live in the thread that created them, not in the thread -they create) - -This patch causes deleteLater to be run in the right thread. - -QCoreApplication::postEvent is thread safe but it needs to be in the -right thread to work out the correct event loop level for deferred -delete events. - -BUG: 351485 -REVIEW: 126955 ---- - src/workspace/fileitemplugin/FileItemLinkingPlugin.cpp | 2 +- - .../fileitemplugin/FileItemLinkingPluginActionLoader.cpp | 9 +++++++-- - src/workspace/fileitemplugin/FileItemLinkingPluginActionLoader.h | 4 ++-- - 3 files changed, 10 insertions(+), 5 deletions(-) - -diff --git a/src/workspace/fileitemplugin/FileItemLinkingPlugin.cpp b/src/workspace/fileitemplugin/FileItemLinkingPlugin.cpp -index a887132..f3f6dde 100644 ---- a/src/workspace/fileitemplugin/FileItemLinkingPlugin.cpp -+++ b/src/workspace/fileitemplugin/FileItemLinkingPlugin.cpp -@@ -124,7 +124,7 @@ void FileItemLinkingPlugin::Private::loadAllActions() - setActions({ action }); - - } else if (!loaded) { -- auto loader = new FileItemLinkingPluginActionLoader(items); -+ auto loader = FileItemLinkingPluginActionLoader::create(items); - - static FileItemLinkingPluginActionStaticInit init; - -diff --git a/src/workspace/fileitemplugin/FileItemLinkingPluginActionLoader.cpp b/src/workspace/fileitemplugin/FileItemLinkingPluginActionLoader.cpp -index 3343eb4..b35713d 100644 ---- a/src/workspace/fileitemplugin/FileItemLinkingPluginActionLoader.cpp -+++ b/src/workspace/fileitemplugin/FileItemLinkingPluginActionLoader.cpp -@@ -40,6 +40,13 @@ - - #include "common/dbus/common.h" - -+FileItemLinkingPluginActionLoader* FileItemLinkingPluginActionLoader::create(const KFileItemListProperties &items) -+{ -+ auto l = new FileItemLinkingPluginActionLoader(items); -+ connect(l, &QThread::finished, l, &QObject::deleteLater); -+ return l; -+} -+ - FileItemLinkingPluginActionLoader::FileItemLinkingPluginActionLoader( - const KFileItemListProperties &items) - : items(items) -@@ -150,8 +157,6 @@ void FileItemLinkingPluginActionLoader::run() - } - - emit result(actions); -- -- deleteLater(); - } - - Action -diff --git a/src/workspace/fileitemplugin/FileItemLinkingPluginActionLoader.h b/src/workspace/fileitemplugin/FileItemLinkingPluginActionLoader.h -index 50dccc5..5264a45 100644 ---- a/src/workspace/fileitemplugin/FileItemLinkingPluginActionLoader.h -+++ b/src/workspace/fileitemplugin/FileItemLinkingPluginActionLoader.h -@@ -33,8 +33,7 @@ class FileItemLinkingPluginActionLoader: public QThread { - Q_OBJECT - - public: -- FileItemLinkingPluginActionLoader(const KFileItemListProperties &items); -- -+ static FileItemLinkingPluginActionLoader* create(const KFileItemListProperties &items); - void run() Q_DECL_OVERRIDE; - - Action createAction(const QString &activity, bool link, -@@ -46,6 +45,7 @@ Q_SIGNALS: - void result(const ActionList &actions); - - private: -+ FileItemLinkingPluginActionLoader(const KFileItemListProperties &items); - KFileItemListProperties items; - KActivities::Consumer activities; - }; --- -2.4.10 - |