/* only do this if we're the last loop destroyed */
if (!all_loops) {
- guint i;
-
/* grab all the signals that cause core dumps */
for (i = 0; i < NUM_CORE_SIGNALS; ++i) {
if (all_signals[core_signals[i]].installed) {
for (it = loop->timers; it; it = g_slist_next(it)) {
ObMainLoopTimer *t = it->data;
- if (t->func == handler && t->equal(t->data, data)) {
+ if (t->func == handler &&
+ (t->equal ? t->equal(t->data, data) : (t->data == data)))
+ {
t->del_me = TRUE;
if (cancel_dest)
t->destroy = NULL;