From: Mikael Magnusson <mikachu@comhem.se>
Date: Sun, 27 Jan 2008 20:03:55 +0000 (+0100)
Subject: Change <placeOn> to <monitor>.
X-Git-Tag: release-3.4.6^2~13
X-Git-Url: http://git.openbox.org/?p=mikachu%2Fopenbox.git;a=commitdiff_plain;h=d7837051412b03ef167744d26043c0413614f85b

Change <placeOn> to <monitor>.
---

diff --git a/data/rc.xml b/data/rc.xml
index ccaa849..d164660 100644
--- a/data/rc.xml
+++ b/data/rc.xml
@@ -35,7 +35,7 @@
   <center>yes</center>
   <!-- whether to place windows in the center of the free area found or
        the top left corner -->
-  <placeOn>Any</placeOn>
+  <monitor>Any</monitor>
   <!-- with Smart placement on a multi-monitor system, try to place new windows
        on: 'Any' - any monitor, 'Mouse' - where the mouse is, 'Active' - where
        the active window is -->
diff --git a/data/rc.xsd b/data/rc.xsd
index bd4c0cb..bc8a8fe 100644
--- a/data/rc.xsd
+++ b/data/rc.xsd
@@ -54,7 +54,7 @@
         </xsd:annotation>
         <xsd:element name="policy" type="ob:placementpolicy"/>
         <xsd:element name="center" type="ob:bool"/>
-        <xsd:element name="placeOn" type="ob:placementmonitor"/>
+        <xsd:element name="monitor" type="ob:placementmonitor"/>
     </xsd:complexType>
     <xsd:complexType name="margins">
         <xsd:annotation>
diff --git a/openbox/config.c b/openbox/config.c
index 5e6387b..69904d8 100644
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -491,7 +491,7 @@ static void parse_placement(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
             config_place_policy = OB_PLACE_POLICY_MOUSE;
     if ((n = parse_find_node("center", node)))
         config_place_center = parse_bool(doc, n);
-    if ((n = parse_find_node("placeOn", node))) {
+    if ((n = parse_find_node("monitor", node))) {
         if (parse_contains("active", doc, n))
             config_place_monitor = OB_PLACE_MONITOR_ACTIVE;
         else if (parse_contains("mouse", doc, n))