rename switchtodesktop to gotodesktop. make stuff compile as well.

diff --git a/Makefile.am b/Makefile.am
index 61cb6bbb470bcdd5df2fac4e5e92d956eea859bd..0c5d7cc8edfffec28e5b8afb9bb2a10cf6167630 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -159,7 +159,6 @@ openbox_openbox_SOURCES = \
        openbox/actions/desktop.c \
        openbox/actions/dockautohide.c \
        openbox/actions/directionalcyclewindows.c \
-       openbox/actions/directionaldesktop.c \
        openbox/actions/directionaltargetwindow.c \
        openbox/actions/execute.c \
        openbox/actions/exit.c \

diff --git a/openbox/actions/all.c b/openbox/actions/all.c
index a80443bf0525a5941bcf6babb1570a992d2856e6..c4d7982ca9b3ec7f56a8e432a2567d5e5d6bcaa3 100644 (file)
--- a/openbox/actions/all.c
+++ b/openbox/actions/all.c
@@ -31,7 +31,6 @@ void action_all_startup()
     action_resize_startup();
     action_decorations_startup();
     action_desktop_startup();
-    action_directionaldesktop_startup();
     action_resizerelative_startup();
     action_addremovedesktop_startup();
     action_dockautohide_startup();

diff --git a/openbox/actions/all.h b/openbox/actions/all.h
index 17b4fe3b7e9db6a9eafac81b827cfa11960897ae..5ab6f3667a56cac28d3ff841cec7381605c39639 100644 (file)
--- a/openbox/actions/all.h
+++ b/openbox/actions/all.h
@@ -32,7 +32,6 @@ void action_directionaltargetwindow_startup();
 void action_resize_startup();
 void action_decorations_startup();
 void action_desktop_startup();
-void action_directionaldesktop_startup();
 void action_resizerelative_startup();
 void action_addremovedesktop_startup();
 void action_dockautohide_startup();

diff --git a/openbox/actions/desktop.c b/openbox/actions/desktop.c
index 3132a4fc253573453ab0107162de6b4a8b15caea..0e9ad7399d192fd0b8dce391e6a4be7dac6145e5 100644 (file)
--- a/openbox/actions/desktop.c
+++ b/openbox/actions/desktop.c
@@ -21,12 +21,12 @@ typedef struct {
             gboolean wrap;
             ObDirection dir;
         } rel;
-    }
+    };
     gboolean send;
     gboolean follow;
 } Options;
 
-static gpointer setup_switch_func(ObParseInst *i, xmlDocPtr doc,
+static gpointer setup_go_func(ObParseInst *i, xmlDocPtr doc,
                                   xmlNodePtr node);
 static gpointer setup_send_func(ObParseInst *i, xmlDocPtr doc,
                                 xmlNodePtr node);
@@ -34,13 +34,13 @@ static gboolean run_func(ObActionsData *data, gpointer options);
 
 void action_desktop_startup()
 {
-    actions_register("SwitchToDesktop", setup_switch_func, g_free, run_func,
+    actions_register("GoToDesktop", setup_go_func, g_free, run_func,
                      NULL, NULL);
     actions_register("SendToDesktop", setup_send_func, g_free, run_func,
                      NULL, NULL);
 }
 
-static gpointer setup_switch_func(ObParseInst *i, xmlDocPtr doc,
+static gpointer setup_go_func(ObParseInst *i, xmlDocPtr doc,
                                   xmlNodePtr node)
 {
     xmlNodePtr n;
@@ -104,7 +104,10 @@ static gpointer setup_switch_func(ObParseInst *i, xmlDocPtr doc,
 static gpointer setup_send_func(ObParseInst *i, xmlDocPtr doc,
                                 xmlNodePtr node)
 {
-    Options *o = setup_switch_func(i, doc, node);
+    xmlNodePtr n;
+    Options *o;
+
+    o = setup_go_func(i, doc, node);
     o->send = TRUE;
     o->follow = TRUE;
 
@@ -130,9 +133,9 @@ static gboolean run_func(ObActionsData *data, gpointer options)
         d = o->abs.desktop;
         break;
     case RELATIVE:
-        d = screen_cycle_desktop(o->abs.dir,
-                                 o->abs.wrap,
-                                 o->abs.linear,
+        d = screen_cycle_desktop(o->rel.dir,
+                                 o->rel.wrap,
+                                 o->rel.linear,
                                  FALSE, TRUE, FALSE);
         break;
     }