more fixes for the transient tree

[chaz/openbox] / openbox / config.c

diff --git a/openbox/config.c b/openbox/config.c
index 36ee408c8f026a0664391033d73b6e4645894fa2..4e3f6f9aaa7204ddb92114b9fc7b0a176dcfe821 100644 (file)
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -46,6 +46,7 @@ RrFont *config_font_activewindow;
 RrFont *config_font_inactivewindow;
 RrFont *config_font_menuitem;
 RrFont *config_font_menutitle;
+RrFont *config_font_osd;
 
 gint    config_desktops_num;
 GSList *config_desktops_names;
@@ -289,7 +290,7 @@ static void parse_key(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
             n = parse_find_node("keybind", n->next);
         }
     }
-    if ((n = parse_find_node("action", node->children))) {
+    else if ((n = parse_find_node("action", node->children))) {
         while (n) {
             ObAction *action;
             
@@ -467,10 +468,12 @@ static void parse_theme(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
             font = &config_font_activewindow;
         else if (parse_attr_contains("InactiveWindow", n, "place"))
             font = &config_font_inactivewindow;
-        else if (parse_attr_contains("MenuTitle", n, "place"))
+        else if (parse_attr_contains("MenuHeader", n, "place"))
             font = &config_font_menutitle;
         else if (parse_attr_contains("MenuItem", n, "place"))
             font = &config_font_menuitem;
+        else if (parse_attr_contains("OnScreenDisplay", n, "place"))
+            font = &config_font_osd;
         else
             goto next_font;