[SCM] KDE Base Workspace module packaging branch, wheezy, updated. debian/4.8.4-4-6-ge574972

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde-workspace.git;a=commitdiff;h=12d434c

The following commit has been merged in the wheezy branch:
commit 12d434c2db52b75ebae2196c0dfbe2c1a99a41d4
Author: Pino Toscano <pino at debian.org>
Date:   Mon Oct 29 11:27:46 2012 +0100

    fix the "demand" status of windows in taskbar widget (#685334)
    
    backport upstream commit 89161c40e064958aa192b2202670316671d7e377
---
 debian/changelog                                   |    6 +++
 debian/patches/series                              |    1 +
 ...tention-demanding-status-has-changed-when.patch |   36 ++++++++++++++++++++
 3 files changed, 43 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 428e8ee..65690e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,12 @@ kde-workspace (4:4.8.4-5) UNRELEASED; urgency=low
   * Remove "New upstream release" from the previous changelog entry
     (Closes: #691302). Thanks Filipus Klutiero.
 
+  [ Pino Toscano ]
+  * Backport upstream commit 89161c40e064958aa192b2202670316671d7e377 to fix
+    the "demand" status of windows in the taskbar widget; patch
+    upstream_Check-if-attention-demanding-status-has-changed-when.patch.
+    (Closes: #685334)
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 24 Oct 2012 17:06:28 -0300
 
 kde-workspace (4:4.8.4-4) unstable; urgency=low
diff --git a/debian/patches/series b/debian/patches/series
index 3f54d79..ab69e1d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,3 +23,4 @@ relax_kdelibs_dependency.diff
 hurd.diff
 upstream_make-sure-scripts-are-executed-sorted.patch
 upstream_centralize-interaction-notification-handling.patch
+upstream_Check-if-attention-demanding-status-has-changed-when.patch
diff --git a/debian/patches/upstream_Check-if-attention-demanding-status-has-changed-when.patch b/debian/patches/upstream_Check-if-attention-demanding-status-has-changed-when.patch
new file mode 100644
index 0000000..bf321f5
--- /dev/null
+++ b/debian/patches/upstream_Check-if-attention-demanding-status-has-changed-when.patch
@@ -0,0 +1,36 @@
+From 89161c40e064958aa192b2202670316671d7e377 Mon Sep 17 00:00:00 2001
+From: "Martin T. H. Sandsmark" <martin.sandsmark at kde.org>
+Date: Tue, 7 Aug 2012 13:23:28 +0200
+Subject: [PATCH] Check if attention demanding status has changed when we
+ activate a window.
+
+BUG: 303208
+---
+ libs/taskmanager/task.cpp |   11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/libs/taskmanager/task.cpp b/libs/taskmanager/task.cpp
+index be5f772..1cb72bd 100644
+--- a/libs/taskmanager/task.cpp
++++ b/libs/taskmanager/task.cpp
+@@ -168,7 +168,16 @@ void Task::refreshIcon()
+ 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 {
+-- 
+1.7.10.4
+

-- 
KDE Base Workspace module packaging