M openbox/frame.c → 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);
@@ -55,18 +54,6 @@ return XCreateWindow(ob_display, parent, 0, 0, 1, 1, 0,
                          RrDepth(ob_rr_inst), InputOutput,
                          RrVisual(ob_rr_inst), mask, attrib);
                        
-}
-
-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()
@@ -919,11 +906,6 @@ self->focused = FALSE;
     }
 
     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)

M openbox/frame.h → openbox/frame.h

@@ -141,8 +141,6 @@ gboolean  flash_on;
     GTimeVal  flash_end;
 };
 
-void frame_startup(gboolean reconfig);
-void frame_shutdown(gboolean reconfig);
 ObFrame *frame_new();
 void frame_show(ObFrame *self);
 void frame_hide(ObFrame *self);

M openbox/openbox.c → openbox/openbox.c

@@ -248,7 +248,6 @@ screen_startup(reconfigure);
             grab_startup(reconfigure);
             group_startup(reconfigure);
             client_startup(reconfigure);
-            frame_startup(reconfigure);
             dock_startup(reconfigure);
             moveresize_startup(reconfigure);
             keyboard_startup(reconfigure);
@@ -285,7 +284,6 @@ mouse_shutdown(reconfigure);
             keyboard_shutdown(reconfigure);
             moveresize_shutdown(reconfigure);
             dock_shutdown(reconfigure);
-            frame_shutdown(reconfigure);
             client_shutdown(reconfigure);
             group_shutdown(reconfigure);
             grab_shutdown(reconfigure);