X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmainloop.c;h=26ba4f9be633333e32c7d1424cd2ed0865c01f5e;hb=9d1949f0b168650e38dcb9adf1ad93e8b90a9b44;hp=5e053da43795227e26a8ab8567c7c2fffc4c9c9d;hpb=0e6161b0d4953b81273200fd31bd9c14fac4981b;p=chaz%2Fopenbox

diff --git a/openbox/mainloop.c b/openbox/mainloop.c
index 5e053da4..26ba4f9b 100644
--- a/openbox/mainloop.c
+++ b/openbox/mainloop.c
@@ -1,6 +1,7 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    mainloop.c for the Openbox window manager
+   Copyright (c) 2006        Mikael Magnusson
    Copyright (c) 2003        Ben Jansens
 
    This program is free software; you can redistribute it and/or modify
@@ -417,7 +418,8 @@ static void sighandler(gint sig)
             /* XXX special case for signals that default to core dump.
                but throw some helpful output here... */
 
-            fprintf(stderr, "Fuck yah. Core dump. (Signal=%d)\n", sig);
+            fprintf(stderr, "How are you gentlemen? All your base are"
+                    " belong to us. (Signal=%d)\n", sig);
 
             /* die with a core dump */
             abort();
@@ -607,16 +609,18 @@ void ob_main_loop_timeout_remove(ObMainLoop *loop,
     }
 }
 
-void ob_main_loop_timeout_remove_data(ObMainLoop *loop,
-                                      GSourceFunc handler,
-                                      gpointer data)
+void ob_main_loop_timeout_remove_data(ObMainLoop *loop, GSourceFunc handler,
+                                      gpointer data, gboolean cancel_dest)
 {
     GSList *it;
 
     for (it = loop->timers; it; it = g_slist_next(it)) {
         ObMainLoopTimer *t = it->data;
-        if (t->func == handler && t->data == data)
+        if (t->func == handler && t->data == data) {
             t->del_me = TRUE;
+            if (cancel_dest)
+                t->destroy = NULL;
+        }
     }
 }
 
@@ -667,7 +671,7 @@ static void timer_dispatch(ObMainLoop *loop, GTimeVal **wait)
             g_free(curr);
             continue;
         }
-	
+
         /* the queue is sorted, so if this timer shouldn't fire, none are 
            ready */
         if (timecompare(&NEAREST_TIMEOUT(loop), &loop->now) < 0)