X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fconfig.c;h=4251390c9fcd031fc9d60595e80fcb0e1133d180;hb=4ccc4c5ed7d5cffc4bf733191f7bc30fbbf069c8;hp=61b786fb4b8a4cda2361523094077256146b37ff;hpb=84a60ebbfbdf9deea446c35c53f8703edeb8213d;p=chaz%2Fopenbox

diff --git a/openbox/config.c b/openbox/config.c
index 61b786fb..4251390c 100644
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -8,8 +8,6 @@
 
 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;
@@ -175,12 +173,8 @@ static void parse_focus(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
         config_focus_new = parse_bool(doc, n);
     if ((n = parse_find_node("followMouse", node)))
         config_focus_follow = parse_bool(doc, n);
-    if ((n = parse_find_node("focusLast", 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);
+        config_focus_delay = parse_int(doc, n) * 1000;
 }
 
 static void parse_theme(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
@@ -299,7 +293,7 @@ static void parse_dock(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, void *d)
     if ((n = parse_find_node("autoHide", node)))
         config_dock_hide = parse_bool(doc, n);
     if ((n = parse_find_node("hideTimeout", node)))
-        config_dock_hide_timeout = parse_int(doc, n);
+        config_dock_hide_timeout = parse_int(doc, n) * 1000;
 }
 
 static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, void *d)
@@ -332,8 +326,6 @@ void config_startup(ObParseInst *i)
 {
     config_focus_new = TRUE;
     config_focus_follow = FALSE;
-    config_focus_last = TRUE;
-    config_focus_last_on_desktop = TRUE;
     config_focus_delay = 0;
 
     parse_register(i, "focus", parse_focus, NULL);
@@ -360,7 +352,7 @@ void config_startup(ObParseInst *i)
     config_dock_y = 0;
     config_dock_orient = OB_ORIENTATION_VERT;
     config_dock_hide = FALSE;
-    config_dock_hide_timeout = 3000;
+    config_dock_hide_timeout = 300;
 
     parse_register(i, "dock", parse_dock, NULL);
 
@@ -390,6 +382,8 @@ void config_shutdown()
 
     g_free(config_theme);
 
+    g_free(config_title_layout);
+
     for (it = config_desktops_names; it; it = g_slist_next(it))
         g_free(it->data);
     g_slist_free(config_desktops_names);