[Xfce4-commits] <xfwm4:xfce-4.8> Add missing bit from master causing pidgin buddy list to be shown on all workspaces (Bug #8263)

[Olivier Fourdan]

Updating branch refs/heads/xfce-4.8
         to 7ec005d9d0dfae2e9fc617c74b18bcc3e7e9919e (commit)
       from 30e7cb0fc8b51d9bfe08ce0c04f08f09889bef88 (commit)

commit 7ec005d9d0dfae2e9fc617c74b18bcc3e7e9919e
Author: Olivier Fourdan <fourdan at xfce.org>
Date:   Sun Jan 8 12:15:04 2012 +0100

    Add missing bit from master causing pidgin buddy list to be shown on all workspaces (Bug #8263)

 src/transients.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/transients.c b/src/transients.c
index 7910fe7..5706783 100644
--- a/src/transients.c
+++ b/src/transients.c
@@ -255,10 +255,13 @@ clientTransientOrModalHasAncestor (Client * c, guint ws)
     for (list = screen_info->windows_stack; list; list = g_list_next (list))
     {
         c2 = (Client *) list->data;
-        if ((c2 != c) && !clientIsTransientOrModal (c2)
+        if ((c2 != c)
+            && !clientIsTransientOrModal (c2)
             && clientIsTransientOrModalFor (c, c2)
-            && !FLAG_TEST (c2->flags, CLIENT_FLAG_ICONIFIED)
-            && (c2->win_workspace == ws))
+            && FLAG_TEST (c2->xfwm_flags, XFWM_FLAG_VISIBLE)
+            && (c2->win_workspace == ws)
+            && (((ws == screen_info->current_ws) && FLAG_TEST (c2->xfwm_flags, XFWM_FLAG_VISIBLE))
+                || !FLAG_TEST (c2->flags, CLIENT_FLAG_ICONIFIED)))
         {
             return TRUE;
         }