make history placement optional

[chaz/openbox] / openbox / action.c

diff --git a/openbox/action.c b/openbox/action.c
index f3ee6be5643243aa119a2bb278bace1c788faf7a..3e463d668732643037b45ff89aa131e3ecd4e4a5 100644 (file)
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -3,7 +3,7 @@
 #include "frame.h"
 #include "screen.h"
 #include "action.h"
-#include "snap.h"
+#include "dispatch.h"
 
 #include <glib.h>
 
@@ -30,7 +30,7 @@ void action_free(Action *a)
 
 void action_execute(union ActionData *data)
 {
-    GError *e;
+    GError *e = NULL;
     if (!g_spawn_command_line_async(data->execute.path, &e)) {
         g_warning("failed to execute '%s': %s",
                   data->execute.path, e->message);
@@ -73,6 +73,11 @@ void action_close(union ActionData *data)
     client_close(data->client.c);
 }
 
+void action_kill(union ActionData *data)
+{
+    client_kill(data->client.c);
+}
+
 void action_shade(union ActionData *data)
 {
     client_shade(data->client.c, TRUE);
@@ -402,7 +407,7 @@ void action_move(union ActionData *data)
     int x = data->move.x;
     int y = data->move.y;
 
-    snap_move(c, &x, &y, c->frame->area.width, c->frame->area.height);
+    dispatch_move(c, &x, &y);
 
     frame_frame_gravity(c->frame, &x, &y); /* get where the client should be */
     client_configure(c, Corner_TopLeft, x, y, c->area.width, c->area.height,