don't compare client pointers with random numbers

[chaz/openbox] / openbox / event.c

diff --git a/openbox/event.c b/openbox/event.c
index 502d196214957381468d58e30bf85740f7c50856..6f819cc1f4c0838524d03fdd590d416e95fb3e23 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -591,8 +591,7 @@ static void event_process(const XEvent *ec, gpointer data)
 
                 if (e->type == ButtonPress || e->type == ButtonRelease ||
                     e->type == MotionNotify) {
-                    if (!keyboard_interactively_grabbed())
-                        mouse_event(client, e);
+                    mouse_event(client, e);
                 } else if (e->type == KeyPress) {
                     keyboard_event((focus_cycle_target ? focus_cycle_target :
                                     (focus_hilite ? focus_hilite : client)),
@@ -1353,8 +1352,8 @@ static void focus_delay_dest(gpointer data)
 
 static gboolean focus_delay_cmp(gconstpointer d1, gconstpointer d2)
 {
-    const ObFocusDelayData *f1 = d1, *f2 = d2;
-    return f1->client == f2->client;
+    const ObFocusDelayData *f1 = d1;
+    return f1->client == d2;
 }
 
 static gboolean focus_delay_func(gpointer data)