X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient.c;h=bf7723365fdde511c1fa1e39ccbd68ba951f191c;hb=ca8924a5a004816cf7db39bcf4851312ef93a2dc;hp=573c271c8cb8eb2049bc14e5818cb35704056bfd;hpb=a8fe821fddc2f30b4031bd9f9e854382a9f0b76e;p=chaz%2Fopenbox

diff --git a/openbox/client.c b/openbox/client.c
index 573c271c..bf772336 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -2357,7 +2357,6 @@ static void client_change_wm_state(ObClient *self)
         state[0] = self->wmstate;
         state[1] = None;
         PROP_SETA32(self->window, wm_state, wm_state, state, 2);
-        ob_debug("setting wm_state %d\n", self->wmstate);
     }
 }
 
@@ -2541,8 +2540,7 @@ gboolean client_hide(ObClient *self)
                actions should not rely on being able to move focus during an
                interactive grab.
             */
-            if (keyboard_interactively_grabbed())
-                keyboard_interactive_cancel();
+            event_cancel_all_key_grabs();
         }
 
         frame_hide(self->frame);
@@ -3527,8 +3525,7 @@ gboolean client_focus(ObClient *self)
        actions should not rely on being able to move focus during an
        interactive grab.
     */
-    if (keyboard_interactively_grabbed())
-        keyboard_interactive_cancel();
+    event_cancel_all_key_grabs();
 
     xerror_set_ignore(TRUE);
     xerror_occured = FALSE;