From: Mikael Magnusson <mikachu@comhem.se>
Date: Wed, 25 Apr 2007 15:45:36 +0000 (+0000)
Subject: merge r5923 from trunk
X-Git-Tag: openbox-3_3_991-RELEASE~215
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=05dcac558db4c581b28676b8fbf8371872945585;p=dana%2Fopenbox.git

merge r5923 from trunk
---

diff --git a/data/rc.xml.in b/data/rc.xml.in
index a113fbc5..6233c2e2 100644
--- a/data/rc.xml.in
+++ b/data/rc.xml.in
@@ -94,7 +94,7 @@
   <floatingX>0</floatingX>
   <floatingY>0</floatingY>
   <noStrut>no</noStrut>
-  <stacking>Top</stacking>
+  <stacking>Above</stacking>
   <direction>Vertical</direction>
   <!-- 'Vertical' or 'Horizontal' -->
   <autoHide>no</autoHide>
diff --git a/openbox/config.c b/openbox/config.c
index 948b9107..fda9d9f0 100644
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -598,11 +598,11 @@ static void parse_dock(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
             config_dock_nostrut = parse_bool(doc, n);
     }
     if ((n = parse_find_node("stacking", node))) {
-        if (parse_contains("top", doc, n))
+        if (parse_contains("above", doc, n))
             config_dock_layer = OB_STACKING_LAYER_ABOVE;
         else if (parse_contains("normal", doc, n))
             config_dock_layer = OB_STACKING_LAYER_NORMAL;
-        else if (parse_contains("bottom", doc, n))
+        else if (parse_contains("below", doc, n))
             config_dock_layer = OB_STACKING_LAYER_BELOW;
     }
     if ((n = parse_find_node("direction", node))) {