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

[chaz/openbox] / openbox / mainloop.c

diff --git a/openbox/mainloop.c b/openbox/mainloop.c
index 9676f07e1d3512b375013c813dffe3ac77001ac7..b59564a2075f192eb05e4e0bc05a8d05e7de892d 100644 (file)
--- a/openbox/mainloop.c
+++ b/openbox/mainloop.c
@@ -608,16 +608,18 @@ void ob_main_loop_timeout_remove(ObMainLoop *loop,
     }
 }
 
-void ob_main_loop_timeout_remove_data(ObMainLoop *loop,
-                                      GSourceFunc handler,
-                                      gpointer data)
+void ob_main_loop_timeout_remove_data(ObMainLoop *loop, GSourceFunc handler,
+                                      gpointer data, gboolean cancel_dest)
 {
     GSList *it;
 
     for (it = loop->timers; it; it = g_slist_next(it)) {
         ObMainLoopTimer *t = it->data;
-        if (t->func == handler && t->data == data)
+        if (t->func == handler && t->data == data) {
             t->del_me = TRUE;
+            if (cancel_dest)
+                t->destroy = NULL;
+        }
     }
 }