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;
- }
}
}
if (curr->func(curr->data)) {
g_time_val_add(&curr->timeout, curr->delay);
insert_timer(loop, curr);
- } else if (curr->destroy) {
- curr->destroy(curr->data);
+ } else {
+ if (curr->destroy)
+ curr->destroy(curr->data);
+ g_free(curr);
}
/* if at least one timer fires, then don't wait on X events, as there