Merge branch 'backport' into work

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

diff --git a/openbox/actions/showdesktop.c b/openbox/actions/showdesktop.c
index 8781f95d42a79f776f95955f9400bad0feec8dfe..6dc77d5e7e65aef08a6e6ff8401b29d7e4eeb8c4 100644 (file)
--- a/openbox/actions/showdesktop.c
+++ b/openbox/actions/showdesktop.c
@@ -3,12 +3,9 @@
 
 static gboolean run_func(ObActionsData *data, gpointer options);
 
-void action_showdesktop_startup()
+void action_showdesktop_startup(void)
 {
-    actions_register("ShowDesktop",
-                     NULL, NULL,
-                     run_func,
-                     NULL, NULL);
+    actions_register("ToggleShowDesktop", NULL, NULL, run_func);
 }
 
 /* Always return FALSE because its not interactive */