indenting

[chaz/openbox] / openbox / keyboard.c

diff --git a/openbox/keyboard.c b/openbox/keyboard.c
index 1499421353597377dff61036373fef075a0eac3f..11b3a98509a058fa6964384342f123f117b13fbc 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;
@@ -205,18 +197,17 @@ void keyboard_interactive_end(ObInteractiveState *s,
     }
 }
 
-void keyboard_interactive_end_client(gpointer data)
+void keyboard_interactive_end_client(ObClient *client, gpointer data)
 {
     GSList *it, *next;
-    ObClient *c = data;
 
     for (it = interactive_states; it; it = next) {
         ObInteractiveState *s = it->data;
 
         next = g_slist_next(it);
 
-        if (s->client == c)
-            keyboard_interactive_end(s, 0, FALSE);
+        if (s->client == client)
+            s->client = NULL;
     }
 }
 
@@ -299,7 +290,7 @@ void keyboard_startup(gboolean reconfig)
     grab_keys(TRUE);
 
     if (!reconfig)
-        client_add_destructor(keyboard_interactive_end_client);
+        client_add_destructor(keyboard_interactive_end_client, NULL);
 }
 
 void keyboard_shutdown(gboolean reconfig)