From be9597bce96016b6c2e12adb5dfb9a950b16682b Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 03 2016 06:15:59 +0000
Subject: import kde-workspace-4.11.19-8.el7


---

diff --git a/SOURCES/kde-workspace-4.10-bz#921742.patch b/SOURCES/kde-workspace-4.10-bz#921742.patch
index 865d4a6..0433650 100644
--- a/SOURCES/kde-workspace-4.10-bz#921742.patch
+++ b/SOURCES/kde-workspace-4.10-bz#921742.patch
@@ -107,10 +107,10 @@ index d096d74..c35b29d 100644
 +                    case ActionPool::NoAction:
 +                    default:
 +                        // Ouch, error. But let's just warn and move on anyway
-+                        emitNotification("powerdevilerror", i18n("The profile \"%1\" tried to activate %2, "
-+                                        "a non existent action. This is usually due to an installation problem"
-+                                        " or to a configuration problem.",
-+                                        profileId, actionName));
++                        //TODO Maybe Remove from the configuration if unsupported
++                        kWarning() << "The profile " << profileId <<  "tried to activate"
++                                   << actionName << "a non existent action. This is usually due to an installation problem"
++                                      " or to a configuration problem. or simlpy the action is not supported";
 +                        break;
 +                }
              }
diff --git a/SOURCES/kde-workspace-close-menu-on-closed-task.patch b/SOURCES/kde-workspace-close-menu-on-closed-task.patch
new file mode 100644
index 0000000..b535a88
--- /dev/null
+++ b/SOURCES/kde-workspace-close-menu-on-closed-task.patch
@@ -0,0 +1,14 @@
+diff --git a/plasma/desktop/applets/tasks/tasks.cpp b/plasma/desktop/applets/tasks/tasks.cpp
+index a881e16..4ebb87d 100644
+--- a/plasma/desktop/applets/tasks/tasks.cpp
++++ b/plasma/desktop/applets/tasks/tasks.cpp
+@@ -273,6 +273,9 @@ void Tasks::itemContextMenu(int id)
+         menu->setMinimumWidth(declItem->implicitWidth());
+     }
+ 
++    // Close menu when the delegate is destroyed
++    connect(item, SIGNAL(destroyed(QObject*)), menu, SLOT(close()));
++
+     menu->exec(containment()->corona()->popupPosition(declItem, menu->size()));
+     menu->deleteLater();
+ }
diff --git a/SPECS/kde-workspace.spec b/SPECS/kde-workspace.spec
index cf751fc..2e2899b 100755
--- a/SPECS/kde-workspace.spec
+++ b/SPECS/kde-workspace.spec
@@ -22,7 +22,7 @@
 Summary: KDE Workspace
 Name:    kde-workspace
 Version: 4.11.19
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2
 URL:     https://projects.kde.org/projects/kde/kde-workspace
 Source0: http://download.kde.org/stable/applications/src/14.12.1/kde-workspace-%{version}.tar.xz
@@ -182,6 +182,7 @@ Patch301: kde-workspace-4.10.5-bz#1063302-branding.patch
 Patch302: kde-workspace-exclude_kdm.patch
 Patch303: powerdevil-upower-0.99.patch
 Patch304: kde-workspace-revert-improve-systemtray-on-hdpi-displays.patch
+Patch305: kde-workspace-close-menu-on-closed-task.patch
 
 ## trunk (Plasma 5) patches
 
@@ -616,6 +617,7 @@ Conflicts: kde-workspace < 4.11.15-3
 %endif
 %patch303 -p1 -b .powerdevil-upower099
 %patch304 -p1 -b .improve-systemtray-on-hdpi-displays
+%patch305 -p1 -b .close-menu-on-closed-task.patch
 
 # trunk patches
 
@@ -1356,6 +1358,12 @@ fi
 %endif
 
 %changelog
+* Tue Mar 22 2016 Jan Grulich <jgrulich@redhat.com> - 4.11.10-8
+- Powerdevil: do not notify about a non existent action
+  Resolves: bz#1289149
+- Plasma taskmanager: close context menu when task is closed
+  Resolves: bz#1262603
+
 * Mon Sep 07 2015 Jan Grulich <jgrulich@redhat.com> - 4.11-19-7
 - Requires: cpp
   Resolves: bz#1260129