add a NONE user action, for internal stuff, ie running actions without direct user...

[chaz/openbox] / openbox / keyboard.c

diff --git a/openbox/keyboard.c b/openbox/keyboard.c
index 1499421353597377dff61036373fef075a0eac3f..b1d1d223a5e3cc1f101961c7676185a0c7cbe625 100644 (file)
--- a/openbox/keyboard.c
+++ b/openbox/keyboard.c
@@ -155,11 +155,6 @@ gboolean keyboard_bind(GList *keylist, ObAction *action)
     return TRUE;
 }
 
-gboolean keyboard_interactive_grab_in_progress()
-{
-    return interactive_states != NULL;
-}
-
 void keyboard_interactive_grab(guint state, ObClient *client,
                                ObAction *action)
 {
@@ -167,9 +162,6 @@ void keyboard_interactive_grab(guint state, ObClient *client,
 
     g_assert(action->data.any.interactive);
 
-    if (moveresize_in_progress)
-        moveresize_end(FALSE);
-
     if (!interactive_states) {
         if (!grab_keyboard(TRUE))
             return;
@@ -216,7 +208,7 @@ void keyboard_interactive_end_client(gpointer data)
         next = g_slist_next(it);
 
         if (s->client == c)
-            keyboard_interactive_end(s, 0, FALSE);
+            s->client = NULL;
     }
 }