add a means to tell the timer destroy function not to fire when for example freeing...

[chaz/openbox] / openbox / event.c

diff --git a/openbox/event.c b/openbox/event.c
index 7717e25f08db10866a013f89229b7140b6b792de..1efccdbed85bcdeb2ecef6c81a52197d0be57b94 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -724,7 +724,7 @@ static void event_handle_client(ObClient *client, XEvent *e)
             if (config_focus_follow && config_focus_delay)
                 ob_main_loop_timeout_remove_data(ob_main_loop,
                                                  focus_delay_func,
-                                                 client);
+                                                 client, TRUE);
             break;
         default:
             break;
@@ -1287,7 +1287,7 @@ static gboolean focus_delay_func(gpointer data)
 
 static void focus_delay_client_dest(ObClient *client, gpointer data)
 {
-    ob_main_loop_timeout_remove_data(ob_main_loop, focus_delay_func, client);
+    ob_main_loop_timeout_remove_data(ob_main_loop, focus_delay_func, client, TRUE);
 }
 
 static void event_client_dest(ObClient *client, gpointer data)