X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Fevent.c;h=2c13ceda2617088903d5829987d0f4355e90f299;hb=1fbc70da580b94dfcfe1a8549ed512eb02c5b73a;hp=a38a331fce77b3a16001d92284acf81268eb8516;hpb=e0aa54a8912e34e94d42872dba95ade0fda7fdca;p=chaz%2Fopenbox

diff --git a/openbox/event.c b/openbox/event.c
index a38a331f..2c13ceda 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -1,7 +1,7 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    event.c for the Openbox window manager
-   Copyright (c) 2004        Mikael Magnusson
+   Copyright (c) 2006        Mikael Magnusson
    Copyright (c) 2003        Ben Jansens
 
    This program is free software; you can redistribute it and/or modify
@@ -175,6 +175,7 @@ void event_shutdown(gboolean reconfig)
 #endif
 
     client_remove_destructor(focus_delay_client_dest);
+    client_remove_destructor(event_client_dest);
     XFreeModifiermap(modmap);
 }
 
@@ -723,7 +724,7 @@ static void event_handle_client(ObClient *client, XEvent *e)
             if (config_focus_follow && config_focus_delay)
                 ob_main_loop_timeout_remove_data(ob_main_loop,
                                                  focus_delay_func,
-                                                 client);
+                                                 client, TRUE);
             break;
         default:
             break;
@@ -1286,7 +1287,7 @@ static gboolean focus_delay_func(gpointer data)
 
 static void focus_delay_client_dest(ObClient *client, gpointer data)
 {
-    ob_main_loop_timeout_remove_data(ob_main_loop, focus_delay_func, client);
+    ob_main_loop_timeout_remove_data(ob_main_loop, focus_delay_func, client, TRUE);
 }
 
 static void event_client_dest(ObClient *client, gpointer data)