From 0124ac9765b22abe6fe0ae4bb8826cffe6ebbf3d9895bfa063008fd0ff1d279a Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sat, 12 Dec 2015 22:17:14 +0000 Subject: [PATCH] changelogs OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/frameworkintegration?expand=0&rev=93 --- ...KDE-SNI-actions-in-our-systemtray-qp.patch | 31 ------------------- frameworkintegration.changes | 2 ++ 2 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 0001-Don-t-add-extra-KDE-SNI-actions-in-our-systemtray-qp.patch diff --git a/0001-Don-t-add-extra-KDE-SNI-actions-in-our-systemtray-qp.patch b/0001-Don-t-add-extra-KDE-SNI-actions-in-our-systemtray-qp.patch deleted file mode 100644 index 079b77c..0000000 --- a/0001-Don-t-add-extra-KDE-SNI-actions-in-our-systemtray-qp.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 6e9c03a79e4702e57cb3164233ac2b71f18626a9 Mon Sep 17 00:00:00 2001 -From: David Edmundson -Date: Thu, 12 Nov 2015 19:22:40 +0000 -Subject: [PATCH 1/1] Don't add extra KDE SNI actions in our systemtray qpt - plugin - -If any app is written using QSystemTrayIcon they'll have to provide -their own quit action in order to work on other platforms. If we add -our own entry apps end up with two quit entries. - -BUG: 354991 -REVIEW: 126047 ---- - src/platformtheme/kdeplatformsystemtrayicon.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/platformtheme/kdeplatformsystemtrayicon.cpp b/src/platformtheme/kdeplatformsystemtrayicon.cpp -index 7536697d59ed2b2f11aa10180e87d003b5579a16..8f0ce7b9a95ae4b8c2fba302966166adfc5f59f8 100644 ---- a/src/platformtheme/kdeplatformsystemtrayicon.cpp -+++ b/src/platformtheme/kdeplatformsystemtrayicon.cpp -@@ -268,6 +268,7 @@ void KDEPlatformSystemTrayIcon::init() - { - if (!m_sni) { - m_sni = new KStatusNotifierItem(); -+ m_sni->setStandardActionsEnabled(false); - m_sni->setTitle(QApplication::applicationDisplayName()); - connect(m_sni, &KStatusNotifierItem::activateRequested, [this](bool active, const QPoint &pos) { - Q_UNUSED(active) --- -2.6.2 - diff --git a/frameworkintegration.changes b/frameworkintegration.changes index eab8d65..ea1271a 100644 --- a/frameworkintegration.changes +++ b/frameworkintegration.changes @@ -2,8 +2,10 @@ Thu Dec 10 23:02:17 UTC 2015 - hrvoje.senjan@gmail.com - Update to 5.17.0 + * Add plasmoid installation failed to plasma_workspace.notifyrc * For more details please see: https://www.kde.org/announcements/kde-frameworks-5.17.0.php +- Drop upstreamed 0001-Don-t-add-extra-KDE-SNI-actions-in-our-systemtray-qp.patch ------------------------------------------------------------------- Sun Nov 8 16:57:02 UTC 2015 - hrvoje.senjan@gmail.com