From: Dana Jansens <danakj@orodu.net>
Date: Fri, 11 May 2007 00:24:01 +0000 (+0000)
Subject: merge r6313 from trunk
X-Git-Tag: openbox-3_3_991-RELEASE~101
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=3196de9018aed6210947e09eb7429799415698b5;p=dana%2Fopenbox.git

merge r6313 from trunk
---

diff --git a/openbox/stacking.c b/openbox/stacking.c
index c9ca514b..66aeebcf 100644
--- a/openbox/stacking.c
+++ b/openbox/stacking.c
@@ -562,7 +562,7 @@ void stacking_restack_request(ObClient *client, ObClient *sibling,
     case Above:
         ob_debug("Restack request Above for client %s sibling %s\n",
                  client->title, sibling ? sibling->title : "(all)");
-        if (activate)
+        if (activate && !client->iconic)
             /* use user=TRUE because it is impossible to get a timestamp
                for this */
             client_activate(client, FALSE, TRUE);
@@ -573,7 +573,7 @@ void stacking_restack_request(ObClient *client, ObClient *sibling,
         ob_debug("Restack request TopIf for client %s sibling %s\n",
                  client->title, sibling ? sibling->title : "(all)");
         if (stacking_occluded(client, sibling)) {
-            if (activate)
+            if (activate && !client->iconic)
                 /* use user=TRUE because it is impossible to get a timestamp
                    for this */
                 client_activate(client, FALSE, TRUE);
@@ -586,7 +586,7 @@ void stacking_restack_request(ObClient *client, ObClient *sibling,
                  "%s\n",
                  client->title, sibling ? sibling->title : "(all)");
         if (stacking_occluded(client, sibling)) {
-            if (activate)
+            if (activate && !client->iconic)
                 /* use user=TRUE because it is impossible to get a timestamp
                    for this */
                 client_activate(client, FALSE, TRUE);