merge r5994 from trunk

diff --git a/openbox/client.c b/openbox/client.c
index 27470d34d5e4128a4ae9fcb052b4ac1dcac5e433..600acfcc85e81759722ab65e1adf0525b8f38cc0 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -2633,10 +2633,11 @@ static void client_iconify_recursive(ObClient *self,
             screen_update_areas();
     }
 
-    /* iconify all direct transients */
+    /* iconify all direct transients, and deiconify all transients
+       (non-direct too) */
     for (it = self->transients; it; it = g_slist_next(it))
         if (it->data != self)
-            if (client_is_direct_child(self, it->data))
+            if (client_is_direct_child(self, it->data) || !iconic)
                 client_iconify_recursive(it->data, iconic, curdesk);
 }