[kde-workspace/f17] window keeps status 'asking for attention' after gaining focus (kde#303208)

[Rex Dieter]

commit f5eab7b18be9d78bdd5b3f5f4ffbd38f5d8060ea
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Aug 7 12:18:01 2012 -0500

    window keeps status 'asking for attention' after gaining focus (kde#303208)

 .gitignore                                    |    2 +-
 kde-workspace-4.9-taskmanager_attention.patch |   32 +++++++++++++++++++++++++
 kde-workspace-4.9-tasks_attention.patch       |   23 ++++++++++++++++++
 kde-workspace.spec                            |    9 ++++++-
 4 files changed, 64 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7535a90..cd366f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/kde-workspace-4.8.4.tar.xz
 /kde-workspace-4.8.5.tar.xz
+/kde-workspace-4.9.0.tar.xz
diff --git a/kde-workspace-4.9-taskmanager_attention.patch b/kde-workspace-4.9-taskmanager_attention.patch
new file mode 100644
index 0000000..44b345b
--- /dev/null
+++ b/kde-workspace-4.9-taskmanager_attention.patch
@@ -0,0 +1,32 @@
+From: Martin T. H. Sandsmark <martin.sandsmark at kde.org>
+Date: Tue, 07 Aug 2012 11:23:28 +0000
+Subject: Check if attention demanding status has changed when we activate a window.
+X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&amp;a=commitdiff&amp;h=d3b3cd48f7b32ef891a85e5321b3c61469ae1df3
+---
+Check if attention demanding status has changed when we activate a window.
+
+BUG: 303208
+---
+
+
+--- a/libs/taskmanager/task.cpp
++++ b/libs/taskmanager/task.cpp
+@@ -168,7 +168,16 @@
+ void Task::setActive(bool a)
+ {
+     d->active = a;
+-    emit changed(StateChanged);
++
++    TaskChanges changes = StateChanged;
++
++    if (demandsAttention() != d->demandedAttention) {
++        d->demandedAttention = !d->demandedAttention;
++        changes |= AttentionChanged;
++    }
++
++    emit changed(changes);
++
+     if (a) {
+         emit activated();
+     } else {
+
diff --git a/kde-workspace-4.9-tasks_attention.patch b/kde-workspace-4.9-tasks_attention.patch
new file mode 100644
index 0000000..ec52ae7
--- /dev/null
+++ b/kde-workspace-4.9-tasks_attention.patch
@@ -0,0 +1,23 @@
+From: Martin T. H. Sandsmark <martin.sandsmark at kde.org>
+Date: Tue, 07 Aug 2012 03:35:54 +0000
+Subject: We need to consider the possibility of an Attention wanted flag.
+X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&amp;a=commitdiff&amp;h=c4e93e26e400ff84a9f0a6cd3fd353dbd382c3db
+---
+We need to consider the possibility of an Attention wanted flag.
+---
+
+
+--- a/plasma/desktop/applets/tasks/abstracttaskitem.cpp
++++ b/plasma/desktop/applets/tasks/abstracttaskitem.cpp
+@@ -231,7 +231,9 @@
+     m_flags = flags;
+ 
+     QString newBackground;
+-    if (m_flags & TaskIsMinimized) {
++    if (m_flags & TaskWantsAttention) {
++        newBackground = "attention";
++    } else if (m_flags & TaskIsMinimized) {
+         newBackground = "minimized";
+     } else if (m_flags & TaskHasFocus) {
+         newBackground = "focus";
+
diff --git a/kde-workspace.spec b/kde-workspace.spec
index 1c29c29..794cf12 100644
--- a/kde-workspace.spec
+++ b/kde-workspace.spec
@@ -11,7 +11,7 @@
 Summary: KDE Workspace
 Name:    kde-workspace
 Version: 4.8.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 URL:     https://projects.kde.org/projects/kde/kde-workspace
@@ -101,6 +101,8 @@ Patch57: kde-workspace-4.8.0-bug796969.patch
 Patch58: kde-workspace-4.8.0-systemd-shutdown.patch
 
 ## upstream patches
+Patch100: kde-workspace-4.9-tasks_attention.patch
+Patch101: kde-workspace-4.9-taskmanager_attention.patch
 
 ## plasma active patches
 # adapted version of wac-html-widgets.patch
@@ -428,6 +430,8 @@ Requires: akonadi
 %patch58 -p1 -b .systemd-shutdown
 
 # upstream patches
+%patch100 -p1 -b .tasks_attention
+%patch101 -p1 -b .taskmanager_attention
 
 # plasma-active
 %patch153 -p1 -b .wac-html-widgets
@@ -975,6 +979,9 @@ fi
 
 
 %changelog
+* Tue Aug 07 2012 Rex Dieter <rdieter at fedoraproject.org> 4.8.5-2
+- window keeps status 'asking for attention' after gaining focus (kde#303208)
+
 * Thu Aug 02 2012 Rex Dieter <rdieter at fedoraproject.org> - 4.8.5-1
 - 4.8.5