X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fframe.c;h=881387b628db2664fa044e787bd9c262109a2f5d;hb=c234ed9ecd9d5228744aae018768ff0c04f2d217;hp=2c495b27e76e4071c081e2428547f5c755f364d4;hpb=a2f2fefeffc74e93504588f9545507814857723e;p=chaz%2Fopenbox

diff --git a/openbox/frame.c b/openbox/frame.c
index 2c495b27..881387b6 100644
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -43,7 +43,6 @@
 static void layout_title(ObFrame *self);
 static void flash_done(gpointer data);
 static gboolean flash_timeout(gpointer data);
-static void flash_client_dest(ObClient *client, gpointer data);
 
 static void set_theme_statics(ObFrame *self);
 static void free_theme_statics(ObFrame *self);
@@ -57,18 +56,6 @@ static Window createWindow(Window parent, gulong mask,
                        
 }
 
-void frame_startup(gboolean reconfig)
-{
-    if (reconfig) return;
-    client_add_destructor(flash_client_dest, NULL);
-}
-
-void frame_shutdown(gboolean reconfig)
-{
-    if (reconfig) return;
-    client_remove_destructor(flash_client_dest);
-}
-
 ObFrame *frame_new()
 {
     XSetWindowAttributes attrib;
@@ -569,7 +556,7 @@ void frame_release_client(ObFrame *self, ObClient *client)
     g_hash_table_remove(window_map, &self->tlresize);
     g_hash_table_remove(window_map, &self->trresize);
 
-    ob_main_loop_timeout_remove_data(ob_main_loop, flash_timeout, self);
+    ob_main_loop_timeout_remove_data(ob_main_loop, flash_timeout, self, TRUE);
 
     frame_free(self);
 }
@@ -921,11 +908,6 @@ static gboolean flash_timeout(gpointer data)
     return TRUE; /* go again */
 }
 
-static void flash_client_dest(ObClient *client, gpointer data)
-{
-    ob_main_loop_timeout_remove_data(ob_main_loop, flash_timeout, client);
-}
-
 void frame_flash_start(ObFrame *self)
 {
     self->flash_on = self->focused;