Merge branch 'master' into chaz

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

diff --git a/openbox/actions/iconify.c b/openbox/actions/iconify.c
index b82684ea1babbd9e5f8e7654a45f74594c34008c..e6bdbb7b247f6104a23792195db8e88e49d25c09 100644 (file)
--- a/openbox/actions/iconify.c
+++ b/openbox/actions/iconify.c
@@ -3,12 +3,11 @@
 
 static gboolean run_func(ObActionsData *data, gpointer options);
 
-void action_iconify_startup()
+void action_iconify_startup(void)
 {
     actions_register("Iconify",
                      NULL, NULL,
-                     run_func,
-                     NULL, NULL);
+                     run_func);
 }
 
 /* Always return FALSE because its not interactive */