make openbox base-dir spec compliant, and change the theme dir structure, so that...

[chaz/openbox] / openbox / dock.c

diff --git a/openbox/dock.c b/openbox/dock.c
index 7511366ddc81a999bbdd5897e19220b25837485f..85dbc360f85aea466945142f25a3c9a649f64da2 100644 (file)
--- a/openbox/dock.c
+++ b/openbox/dock.c
@@ -550,8 +550,6 @@ static gboolean hide_timeout(gpointer data)
 
 void dock_hide(gboolean hide)
 {
-    if (dock->hidden == hide || !config_dock_hide)
-        return;
     if (!hide) {
         /* show */
         dock->hidden = FALSE;
@@ -559,8 +557,8 @@ void dock_hide(gboolean hide)
 
         /* if was hiding, stop it */
         ob_main_loop_timeout_remove(ob_main_loop, hide_timeout);
-    } else {
-        ob_main_loop_timeout_add(ob_main_loop, config_dock_hide_timeout * 1000,
+    } else if (!dock->hidden && config_dock_hide) {
+        ob_main_loop_timeout_add(ob_main_loop, config_dock_hide_timeout,
                                  hide_timeout, NULL, NULL);
     }
 }