add the desktop action

[chaz/openbox] / openbox / action.c

diff --git a/openbox/action.c b/openbox/action.c
index 2dca0dd5eeea079ae8d72b1429b63d5c023bd01d..58a0e61ffc7a97efd2659a4c79300230c7cd4aee 100644 (file)
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -162,13 +162,6 @@ void setup_action_send_to_desktop_down(ObAction **a, ObUserAction uact)
     (*a)->data.sendtodir.follow = TRUE;
 }
 
-void setup_action_desktop(ObAction **a, ObUserAction uact)
-{
-/*
-    (*a)->data.desktop.inter.any.interactive = FALSE;
-*/
-}
-
 void setup_action_desktop_prev(ObAction **a, ObUserAction uact)
 {
     (*a)->data.desktopdir.inter.any.interactive = TRUE;
@@ -397,11 +390,6 @@ ActionString actionstrings[] =
         action_send_to_desktop_dir,
         setup_action_send_to_desktop_down
     },
-    {
-        "desktop",
-        action_desktop,
-        setup_action_desktop
-    },
     {
         "desktopnext",
         action_desktop_dir,
@@ -821,19 +809,6 @@ void action_send_to_desktop(union ActionData *data)
     }
 }
 
-void action_desktop(union ActionData *data)
-{
-    /* XXX add the interactive/dialog option back again once the dialog
-       has been made to not use grabs */
-    if (data->desktop.desk < screen_num_desktops ||
-        data->desktop.desk == DESKTOP_ALL)
-    {
-        screen_set_desktop(data->desktop.desk, TRUE);
-        if (data->inter.any.interactive)
-            screen_desktop_popup(data->desktop.desk, TRUE);
-    }
-}
-
 void action_desktop_dir(union ActionData *data)
 {
     guint d;