Merge branch 'master' into chaz

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

diff --git a/openbox/actions/reconfigure.c b/openbox/actions/reconfigure.c
index 8802a37b897d661d37a2002f53a69b3493db40f7..813a12210ed3ad763e79c0f5a2cfd5cbd2417dd3 100644 (file)
--- a/openbox/actions/reconfigure.c
+++ b/openbox/actions/reconfigure.c
@@ -3,12 +3,9 @@
 
 static gboolean run_func(ObActionsData *data, gpointer options);
 
-void action_reconfigure_startup()
+void action_reconfigure_startup(void)
 {
-    actions_register("Reconfigure",
-                     NULL, NULL,
-                     run_func,
-                     NULL, NULL);
+    actions_register("Reconfigure", NULL, NULL, run_func);
 }
 
 /* Always return FALSE because its not interactive */