rm a redundant actiondata struct

diff --git a/openbox/action.c b/openbox/action.c
index 342f0a8..6b98bcb 100644 (file)
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -365,17 +365,17 @@ void action_toggle_maximize_vert(union ActionData *data)
 
 void action_send_to_desktop(union ActionData *data)
 {
-    if (data->sendto.c)
-        if (data->sendto.desktop < screen_num_desktops ||
-            data->sendto.desktop == DESKTOP_ALL)
-            client_set_desktop(data->sendto.c, data->sendto.desktop, TRUE);
+    if (data->desktop.c)
+        if (data->desktop.desk < screen_num_desktops ||
+            data->desktop.desk == DESKTOP_ALL)
+            client_set_desktop(data->desktop.c, data->desktop.desk, TRUE);
 }
 
 void action_send_to_next_desktop(union ActionData *data)
 {
     guint d;
 
-    if (!data->sendto.c) return;
+    if (!data->sendtonextprev.c) return;
 
     d = screen_desktop + 1;
     if (d >= screen_num_desktops) {
@@ -390,7 +390,7 @@ void action_send_to_previous_desktop(union ActionData *data)
 {
     guint d;
 
-    if (!data->sendto.c) return;
+    if (!data->sendtonextprev.c) return;
 
     d = screen_desktop - 1;
     if (d >= screen_num_desktops) {

diff --git a/openbox/action.h b/openbox/action.h
index ff99af9..a8f37e1 100644 (file)
--- a/openbox/action.h
+++ b/openbox/action.h
@@ -26,11 +26,6 @@ struct MoveResizeRelative {
     int delta;
 };
 
-struct SendToDesktop {
-    Client *c;
-    guint desktop;
-};
-
 struct SendToNextPreviousDesktop {
     Client *c;
     gboolean wrap;
@@ -72,7 +67,6 @@ union ActionData {
     struct Execute execute;
     struct ClientAction client;
     struct MoveResizeRelative relative;
-    struct SendToDesktop sendto;
     struct SendToNextPreviousDesktop sendtonextprev;
     struct Desktop desktop;
     struct NextPreviousDesktop nextprevdesktop;
@@ -161,7 +155,7 @@ void action_maximize_vert(union ActionData *data);
 void action_unmaximize_vert(union ActionData *data);
 /* ClientAction */
 void action_toggle_maximize_vert(union ActionData *data);
-/* SendToDesktop */
+/* Desktop */
 void action_send_to_desktop(union ActionData *data);
 /* SendToNextPreviousDesktop */
 void action_send_to_next_desktop(union ActionData *data);