From: Dana Jansens <danakj@orodu.net>
Date: Mon, 7 May 2007 17:07:50 +0000 (+0000)
Subject: same as 6151 in trunk
X-Git-Tag: openbox-3_3_991-RELEASE~146
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=99cd12a55ff5029f089bfdeb4e270d2fe24a707d;p=dana%2Fopenbox.git

same as 6151 in trunk
---

diff --git a/openbox/client.c b/openbox/client.c
index 3b66a836..47bfcabc 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -1254,11 +1254,13 @@ static void client_update_transient_tree(ObClient *self,
     }
             
 
-    /* If the group changed then we need to remove any old group transient
-       windows from our children. But if we're transient for the group, then
+    /* If the group changed, or if we are just becoming transient for the
+       group, then we need to remove any old group transient windows
+       from our children. But if we were already transient for the group, then
        other group transients are not our children. */
-    if (oldgroup != newgroup && oldgroup != NULL &&
-        oldparent != OB_TRAN_GROUP)
+    if ((oldgroup != newgroup ||
+         (newparent == OB_TRAN_GROUP && oldparent != newparent)) &&
+        oldgroup != NULL && oldparent != OB_TRAN_GROUP)
     {
         for (it = self->transients; it; it = next) {
             next = g_slist_next(it);