Merge branch 'backport'

[chaz/openbox] / openbox / dock.c

diff --git a/openbox/dock.c b/openbox/dock.c
index 36b08b06013560a1a92c618b3249e1077378c8e7..9d4b56c4706985807fa0554e2be5b2b9fc2e5f85 100644 (file)
--- a/openbox/dock.c
+++ b/openbox/dock.c
@@ -189,7 +189,7 @@ void dock_add(Window win, XWMHints *wmhints)
     ob_debug("Managed Dock App: 0x%lx (%s)\n", app->icon_win, app->class);
 }
 
-void dock_remove_all()
+void dock_remove_all(void)
 {
     while (dock->dock_apps)
         dock_remove(dock->dock_apps->data, TRUE);
@@ -219,7 +219,7 @@ void dock_remove(ObDockApp *app, gboolean reparent)
     g_free(app);
 }
 
-void dock_configure()
+void dock_configure(void)
 {
     GList *it;
     gint hspot, vspot;
@@ -628,15 +628,17 @@ void dock_hide(gboolean hide)
 {
     if (!hide) {
         if (dock->hidden && config_dock_hide) {
-            ob_main_loop_timeout_add(ob_main_loop, config_dock_show_delay,
-                                 show_timeout, NULL, g_direct_equal, NULL);
+            ob_main_loop_timeout_add(ob_main_loop,
+                                     config_dock_show_delay * 1000,
+                                     show_timeout, NULL, g_direct_equal, NULL);
         } else if (!dock->hidden && config_dock_hide) {
             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_delay,
-                                 hide_timeout, NULL, g_direct_equal, NULL);
+            ob_main_loop_timeout_add(ob_main_loop,
+                                     config_dock_hide_delay * 1000,
+                                     hide_timeout, NULL, g_direct_equal, NULL);
         } else if (dock->hidden && config_dock_hide) {
             ob_main_loop_timeout_remove(ob_main_loop, show_timeout);
         }