config: s/OSD/OnScreenDisplay/ in <theme><font place="OSD">

...to comply with Openbox 3.6 spec [1]

"OSD" is still honoured to maintain backward compatibility.

[1]: http://openbox.org/wiki/Help:Configuration#Theme

diff --git a/docs/labwc-config.5.scd b/docs/labwc-config.5.scd
index db0a40c987eff943303424f3192428ff851d49f7..c5a2680d8bd5950ffca98a6066171daf1eabe65e 100644 (file)
--- a/docs/labwc-config.5.scd
+++ b/docs/labwc-config.5.scd
@@ -126,7 +126,7 @@ The rest of this man page describes configuration options.
        Places can be any of:
        - ActiveWindow - titlebar of active window
        - MenuItem - menu item (currently only root menu)
-       - OSD - items in the on screen display
+       - OnScreenDisplay - items in the on screen display
        If no place attribute is provided, the setting will be applied to all
        places.
 

diff --git a/docs/rc.xml.all b/docs/rc.xml.all
index 12610e791f853c3a5c0222c143ddf82d0600758d..c336340489750adedaa469702837efebc22ec299 100644 (file)
--- a/docs/rc.xml.all
+++ b/docs/rc.xml.all
@@ -31,7 +31,7 @@
       <slant>normal</slant>
       <weight>normal</weight>
     </font>
-    <font place="OSD">
+    <font place="OnScreenDisplay">
       <name>sans</name>
       <size>10</size>
       <slant>normal</slant>

diff --git a/src/config/rcxml.c b/src/config/rcxml.c
index 155a4527b0894177e3fa2f6e05632e2c86bad76d..886f29b551f20dd4d2ca531da05fa644cc6630a1 100644 (file)
--- a/src/config/rcxml.c
+++ b/src/config/rcxml.c
@@ -298,7 +298,8 @@ enum_font_place(const char *place)
                return FONT_PLACE_ACTIVEWINDOW;
        } else if (!strcasecmp(place, "MenuItem")) {
                return FONT_PLACE_MENUITEM;
-       } else if (!strcasecmp(place, "OSD")) {
+       } else if (!strcasecmp(place, "OnScreenDisplay")
+                       || !strcasecmp(place, "OSD")) {
                return FONT_PLACE_OSD;
        }
        return FONT_PLACE_UNKNOWN;