From: Dana Jansens <danakj@orodu.net>
Date: Thu, 10 May 2007 17:15:50 +0000 (+0000)
Subject: merge r6305 from trunk
X-Git-Tag: openbox-3_3_991-RELEASE~105
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=8b2aa623744522d33b426244026274b9d102c666;p=dana%2Fopenbox-history.git

merge r6305 from trunk
---

diff --git a/openbox/client.c b/openbox/client.c
index d8a28a24..8fb48160 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -73,7 +73,6 @@ static void client_get_session_ids(ObClient *self);
 static void client_get_area(ObClient *self);
 static void client_get_desktop(ObClient *self);
 static void client_get_state(ObClient *self);
-static void client_get_layer(ObClient *self);
 static void client_get_shaped(ObClient *self);
 static void client_get_mwm_hints(ObClient *self);
 static void client_get_colormap(ObClient *self);
@@ -1004,6 +1003,7 @@ static void client_get_all(ObClient *self, gboolean real)
        from per-app settings */
     client_get_session_ids(self);
 
+    /* now we got everything that can affect the decorations */
     if (!real)
         return;
 
@@ -1019,9 +1019,6 @@ static void client_get_all(ObClient *self, gboolean real)
                                 desktop is not specified */
     client_get_shaped(self);
 
-    client_get_layer(self); /* if layer hasn't been specified, get it from
-                               other sources if possible */
-
     {
         /* a couple type-based defaults for new windows */
 
@@ -1109,41 +1106,6 @@ static void client_get_desktop(ObClient *self)
     }
 }
 
-static void client_get_layer(ObClient *self)
-{
-    if (!(self->above || self->below)) {
-        if (self->group) {
-            /* apply stuff from the group */
-            GSList *it;
-            gint layer = -2;
-
-            for (it = self->group->members; it; it = g_slist_next(it)) {
-                ObClient *c = it->data;
-                if (c != self && !client_search_transient(self, c) &&
-                    client_normal(self) && client_normal(c))
-                {
-                    layer = MAX(layer,
-                                (c->above ? 1 : (c->below ? -1 : 0)));
-                }
-            }
-            switch (layer) {
-            case -1:
-                self->below = TRUE;
-                break;
-            case -2:
-            case 0:
-                break;
-            case 1:
-                self->above = TRUE;
-                break;
-            default:
-                g_assert_not_reached();
-                break;
-            }
-        }
-    }
-}
-
 static void client_get_state(ObClient *self)
 {
     guint32 *state;