match the func prototypes in the header

[chaz/openbox] / openbox / config.c

diff --git a/openbox/config.c b/openbox/config.c
index 21f03d3e27dea11e6cc692469b2c9781e6534156..e2ca29f7da4b1d682a59846bb8c67f456f6fc34f 100644 (file)
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -10,6 +10,7 @@ gboolean config_focus_new;
 gboolean config_focus_follow;
 gboolean config_focus_last;
 gboolean config_focus_last_on_desktop;
+guint    config_focus_delay;
 
 char *config_theme;
 
@@ -205,6 +206,8 @@ static void parse_focus(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
         config_focus_last = parse_bool(doc, n);
     if ((n = parse_find_node("focusLastOnDesktop", node)))
         config_focus_last_on_desktop = parse_bool(doc, n);
+    if ((n = parse_find_node("focusDelay", node)))
+        config_focus_delay = parse_int(doc, n);
 }
 
 static void parse_theme(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
@@ -214,7 +217,7 @@ static void parse_theme(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
 
     node = node->xmlChildrenNode;
 
-    if ((n = parse_find_node("theme", node))) {
+    if ((n = parse_find_node("name", node))) {
         gchar *c;
 
         g_free(config_theme);
@@ -358,6 +361,7 @@ void config_startup(ObParseInst *i)
     config_focus_follow = FALSE;
     config_focus_last = TRUE;
     config_focus_last_on_desktop = TRUE;
+    config_focus_delay = 150000;
 
     parse_register(i, "focus", parse_focus, NULL);
 
@@ -398,7 +402,7 @@ void config_startup(ObParseInst *i)
     parse_register(i, "mouse", parse_mouse, NULL);
 
     config_resist_win = 10;
-    config_resist_edge = 10;
+    config_resist_edge = 20;
 
     parse_register(i, "resistance", parse_resistance, NULL);