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

diff --git a/data/rc.xml b/data/rc.xml
index 7c37928eefb5e6a2eba5f7414b88201c15759b8b..6e8445aabf05792951c117b29b35b08949ba7dd9 100644 (file)
--- 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 e2850336a506443f905d4398d01b2661ef33d296..fb7da5224e243844de79eefb41b7706744cd996c 100644 (file)
--- 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">