From: Denis Kaganovich <mahatma@eu.by>
Date: Sun, 7 Oct 2012 00:53:36 +0000 (-0400)
Subject: Fix some namings and xml formatting in rc.xml and rc.xsd
X-Git-Tag: mikabox-3.5-7~50
X-Git-Url: http://git.openbox.org/?p=mikachu%2Fopenbox.git;a=commitdiff_plain;h=1974c69fb356a4958316dc7657a5f726804ac648;ds=sidebyside

Fix some namings and xml formatting in rc.xml and rc.xsd
---

diff --git a/data/rc.xml b/data/rc.xml
index 7c37928..6e8445a 100644
--- a/data/rc.xml
+++ b/data/rc.xml
@@ -634,10 +634,10 @@
        submenu will not be shown until it is clicked on -->
   <submenuHideDelay>400</submenuHideDelay>
   <!-- time to delay before hiding a submenu when selecting another
-       entry in parent menu -->
+       entry in parent menu
        if this is a negative value, then the delay is infinite and the
        submenu will not be hidden until a different submenu is opened -->
-  <applicationIcons>yes</applicationIcons>
+  <showIcons>yes</showIcons>
   <!-- controls if icons appear in the client-list-(combined-)menu -->
   <manageDesktops>yes</manageDesktops>
   <!-- show the manage desktops section in the client-list-(combined-)menu -->
diff --git a/data/rc.xsd b/data/rc.xsd
index e285033..fb7da52 100644
--- a/data/rc.xsd
+++ b/data/rc.xsd
@@ -393,7 +393,8 @@
             <xsd:enumeration value="InactiveWindow"/>
             <xsd:enumeration value="MenuHeader"/>
             <xsd:enumeration value="MenuItem"/>
-            <xsd:enumeration value="OnScreenDisplay"/>
+            <xsd:enumeration value="ActiveOnScreenDisplay"/>
+            <xsd:enumeration value="InactiveOnScreenDisplay"/>
         </xsd:restriction>
     </xsd:simpleType>
     <xsd:simpleType name="fontweight">