Merge branch 'backport' into work

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

diff --git a/openbox/actions/dockautohide.c b/openbox/actions/dockautohide.c
index e7f650551550cd791b4d999f27c694414e489c24..5e5382d4475adb780df2f6d481183289602efbe2 100644 (file)
--- a/openbox/actions/dockautohide.c
+++ b/openbox/actions/dockautohide.c
@@ -4,9 +4,9 @@
 
 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);