X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmainloop.c;h=4dce047ee9dd79cc48aa9f56e687067988591ffb;hb=b317f0140398308fce5fbd262ad99a290b54a449;hp=4b07cc4b351731aaeb289b222715523da2ed96d4;hpb=de4f92ccc66c1dad1a2820a07d1f0161bd61a855;p=chaz%2Fopenbox

diff --git a/openbox/mainloop.c b/openbox/mainloop.c
index 4b07cc4b..4dce047e 100644
--- a/openbox/mainloop.c
+++ b/openbox/mainloop.c
@@ -340,7 +340,7 @@ static void sighandler(gint sig)
             /* XXX special case for signals that default to core dump.
                but throw some helpful output here... */
 
-            fprintf(stderr, "Fuck ya. Core dump. (Signal=%d)\n", sig);
+            fprintf(stderr, "Fuck yah. Core dump. (Signal=%d)\n", sig);
 
             /* die with a core dump */
             abort();
@@ -511,6 +511,7 @@ void ob_main_loop_timeout_add(ObMainLoop *loop,
     t->data = data;
     t->destroy = notify;
     t->del_me = FALSE;
+    g_get_current_time(&loop->now);
     t->last = t->timeout = loop->now;
     g_time_val_add(&t->timeout, t->delay);
 
@@ -524,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;
-        }
     }
 }
 
@@ -582,8 +594,10 @@ static void timer_dispatch(ObMainLoop *loop, GTimeVal **wait)
 	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