match the func prototypes in the header

[chaz/openbox] / openbox / mainloop.c

diff --git a/openbox/mainloop.c b/openbox/mainloop.c
index bdfff0386ca6216088a620217d701f1e1a833dfa..397f8ae21a4aced2ad6b1949abb9b9bcc59f08fa 100644 (file)
--- 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,7 +511,7 @@ void ob_main_loop_timeout_add(ObMainLoop *loop,
     t->data = data;
     t->destroy = notify;
     t->del_me = FALSE;
-    g_get_current_time(&now);
+    g_get_current_time(&loop->now);
     t->last = t->timeout = loop->now;
     g_time_val_add(&t->timeout, t->delay);
 
@@ -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;
-        }
     }
 }