Merge branch 'master' into chaz

[chaz/openbox] / openbox / actions / dockautohide.c

diff --git a/openbox/actions/dockautohide.c b/openbox/actions/dockautohide.c
index e7f650551550cd791b4d999f27c694414e489c24..4a750b2c3a368ebea5bcbc03842772db92168578 100644 (file)
--- a/openbox/actions/dockautohide.c
+++ b/openbox/actions/dockautohide.c
@@ -4,12 +4,11 @@
 
 static gboolean run_func(ObActionsData *data, gpointer options);
 
-void action_dockautohide_startup()
+void action_dockautohide_startup(void)
 {
-    actions_register("DockAutoHide",
+    actions_register("ToggleDockAutoHide",
                      NULL, NULL,
-                     run_func,
-                     NULL, NULL);
+                     run_func);
 }
 
 /* Always return FALSE because its not interactive */