M openbox/config.c → openbox/config.c

@@ -44,7 +44,7 @@ gint            config_dock_x;
 gint            config_dock_y;
 ObOrientation   config_dock_orient;
 gboolean        config_dock_hide;
-guint           config_dock_hide_timeout;
+guint           config_dock_hide_delay;
 
 guint config_keyboard_reset_keycode;
 guint config_keyboard_reset_state;
@@ -317,8 +317,8 @@ config_dock_orient = OB_ORIENTATION_VERT;
     }
     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) * 1000;
+    if ((n = parse_find_node("hideDelay", node)))
+        config_dock_hide_delay = parse_int(doc, n) * 1000;
 }
 
 static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node, void *d)
@@ -502,7 +502,7 @@ config_dock_x = 0;
     config_dock_y = 0;
     config_dock_orient = OB_ORIENTATION_VERT;
     config_dock_hide = FALSE;
-    config_dock_hide_timeout = 300;
+    config_dock_hide_delay = 300;
 
     parse_register(i, "dock", parse_dock, NULL);
 

M openbox/config.h → openbox/config.h

@@ -54,7 +54,7 @@ extern ObOrientation config_dock_orient;
 /*! Whether to auto-hide the dock when the pointer is not over it */
 extern gboolean config_dock_hide;
 /*! The number of microseconds to wait before hiding the dock */
-extern guint config_dock_hide_timeout;
+extern guint config_dock_hide_delay;
 
 /* The name of the theme */
 extern char *config_theme;

M openbox/dock.c → openbox/dock.c

@@ -584,7 +584,7 @@ 
         /* if was hiding, stop it */
         ob_main_loop_timeout_remove(ob_main_loop, hide_timeout);
     } else if (!dock->hidden && config_dock_hide) {
-        ob_main_loop_timeout_add(ob_main_loop, config_dock_hide_timeout,
+        ob_main_loop_timeout_add(ob_main_loop, config_dock_hide_delay,
                                  hide_timeout, NULL, NULL);
     }
 }