From efe4ead2144469efc567966304c842fabcc7856e Mon Sep 17 00:00:00 2001
From: mathias <mathias>
Date: Sat, 23 Apr 2005 08:44:45 +0000
Subject: fixed #960535, Deiconify with apps set 'sticky'

---
 ChangeLog         | 4 +++-
 src/FbCommands.cc | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 194ae98..ec2e7ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,9 @@
 (Format: Year/Month/Day)
 Changes for 0.9.13
 *05/04/23:
-  * Fixed #1020399 aka broken ShowDesktop - command (mathias)
+  * Fixed #960535 aka Deiconify with apps set 'sticky' (Mathias)
+    FbCommands.cc
+  * Fixed #1020399 aka broken ShowDesktop - command (Mathias)
     WorkspaceCmd.cc
 *05/04/22:
   * clear maximized-Flags of a resized/moved Window (Mathias)
diff --git a/src/FbCommands.cc b/src/FbCommands.cc
index 9b20071..1dbbd66 100644
--- a/src/FbCommands.cc
+++ b/src/FbCommands.cc
@@ -313,7 +313,8 @@ void DeiconifyCmd::execute() {
     case ALLWORKSPACE:
         for(; it != itend; it++) {
             old_workspace_num= (*it)->workspaceNumber();
-            if (m_mode == ALL || old_workspace_num == workspace_num) {
+            if (m_mode == ALL || old_workspace_num == workspace_num || 
+                    (*it)->isStuck()) {
                 if (m_dest == ORIGIN || m_dest == ORIGINQUIET)
                     screen->sendToWorkspace(old_workspace_num, (*it), change_ws);
                 else
@@ -327,7 +328,8 @@ void DeiconifyCmd::execute() {
     default:
         for (; it != itend; it++) {
             old_workspace_num= (*it)->workspaceNumber();
-            if(m_mode == LAST || old_workspace_num == workspace_num) {
+            if(m_mode == LAST || old_workspace_num == workspace_num ||
+                    (*it)->isStuck()) {
                 if ((m_dest == ORIGIN || m_dest == ORIGINQUIET) && 
                     m_mode != LASTWORKSPACE)
                     screen->sendToWorkspace(old_workspace_num, (*it), change_ws);
-- 
cgit v0.11.2