From: Dana Jansens <danakj@orodu.net>
Date: Fri, 4 May 2007 07:19:21 +0000 (+0000)
Subject: dont move windows away from omnpresentness when deiconifying them
X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=a823e4786e8c0b5ec1940f7a6daaf4572f7d452a;p=chaz%2Fopenbox

dont move windows away from omnpresentness when deiconifying them
---

diff --git a/openbox/client.c b/openbox/client.c
index 256190b9..3e43891e 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -2611,7 +2611,8 @@ static void client_iconify_recursive(ObClient *self,
         } else {
             self->iconic = iconic;
 
-            if (curdesk)
+            if (curdesk && self->desktop != screen_desktop &&
+                self->desktop != DESKTOP_ALL)
                 client_set_desktop(self, screen_desktop, FALSE);
 
             /* this puts it after the current focused window */
@@ -3182,7 +3183,8 @@ void client_activate(ObClient *self, gboolean here, gboolean user)
         if (self->iconic)
             client_iconify(self, FALSE, here);
         if (self->desktop != DESKTOP_ALL &&
-            self->desktop != screen_desktop) {
+            self->desktop != screen_desktop)
+        {
             if (here)
                 client_set_desktop(self, screen_desktop, FALSE);
             else