Merge branch 'master' into chaz

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

diff --git a/openbox/actions/fullscreen.c b/openbox/actions/fullscreen.c
index c791191ee56c318846b05463c0e30049b64acac5..e1fdf232ab5e80038ada460a7ec1adcedff57f11 100644 (file)
--- a/openbox/actions/fullscreen.c
+++ b/openbox/actions/fullscreen.c
@@ -1,24 +1,20 @@
 #include "openbox/actions.h"
 #include "openbox/client.h"
 
-static gboolean run_func(ObActionsData *data, gpointer options);
+static gboolean run_func_toggle(ObActionsData *data, gpointer options);
 
-void action_fullscreen_startup()
+void action_fullscreen_startup(void)
 {
-    actions_register("Fullscreen",
-                     NULL, NULL,
-                     run_func,
-                     NULL, NULL);
+    actions_register("ToggleFullscreen", NULL, NULL, run_func_toggle);
 }
 
 /* Always return FALSE because its not interactive */
-static gboolean run_func(ObActionsData *data, gpointer options)
+static gboolean run_func_toggle(ObActionsData *data, gpointer options)
 {
     if (data->client) {
         actions_client_move(data, TRUE);
         client_fullscreen(data->client, !data->client->fullscreen);
         actions_client_move(data, FALSE);
     }
-
     return FALSE;
 }