add ob_main_loop_timeout_remove_data.

make the timeout remove functions remove *all* timeouts that match

diff --git a/openbox/mainloop.c b/openbox/mainloop.c
index 9df84d34b1ccedc571c2e2ddf462d0a0446b53ae..397f8ae21a4aced2ad6b1949abb9b9bcc59f08fa 100644 (file)
--- a/openbox/mainloop.c
+++ b/openbox/mainloop.c
@@ -525,10 +525,21 @@ void ob_main_loop_timeout_remove(ObMainLoop *loop,
 
     for (it = loop->timers; it; it = g_slist_next(it)) {
         ObMainLoopTimer *t = it->data;
-        if (t->func == handler) {
+        if (t->func == handler)
+            t->del_me = TRUE;
+    }
+}
+
+void ob_main_loop_timeout_remove_data(ObMainLoop *loop,
+                                      GSourceFunc handler,
+                                      gpointer data)
+{
+    GSList *it;
+
+    for (it = loop->timers; it; it = g_slist_next(it)) {
+        ObMainLoopTimer *t = it->data;
+        if (t->func == handler && t->data == data)
             t->del_me = TRUE;
-            break;
-        }
     }
 }
 

diff --git a/openbox/mainloop.h b/openbox/mainloop.h
index ecbcc3893fe4b3c89d97a32b25d0a1dd88dae837..8e0e5ed685dc418a47b9d30a4f70ec26485cb3f9 100644 (file)
--- a/openbox/mainloop.h
+++ b/openbox/mainloop.h
@@ -45,6 +45,9 @@ void ob_main_loop_timeout_add(ObMainLoop *loop,
                               GDestroyNotify notify);
 void ob_main_loop_timeout_remove(ObMainLoop *loop,
                                  GSourceFunc handler);
+void ob_main_loop_timeout_remove_data(ObMainLoop *loop,
+                                      GSourceFunc handler,
+                                      gpointer data);
 
 void ob_main_loop_run(ObMainLoop *loop);
 void ob_main_loop_exit(ObMainLoop *loop);