X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=505dffbc7d0d0622cc1b1f15e6bc2fcb6058f447;hb=6e42b65bda1706887f3b2a7f9d79ba20f7611a06;hp=304d52c6f27abe3c7332458bdec5a82bd509af0b;hpb=f26f23de50cb7941a7702198e3b4d1b2f9de062e;p=chaz%2Fopenbox

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 304d52c6..505dffbc 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -1,4 +1,5 @@
 #include "openbox.h"
+#include "slit.h"
 #include "event.h"
 #include "menu.h"
 #include "client.h"
@@ -185,12 +186,12 @@ int main(int argc, char **argv)
 
         menu_startup();
         frame_startup();
-        stacking_startup();
         moveresize_startup();
 	focus_startup();
 	screen_startup();
         group_startup();
 	client_startup();
+        slit_startup();
 
         /* call startup for all the plugins */
         plugin_startall();
@@ -203,15 +204,16 @@ int main(int argc, char **argv)
 	    event_loop();
 	ob_state = State_Exiting;
 
+        slit_remove_all();
 	client_unmanage_all();
 
         plugin_shutdown(); /* calls all the plugins' shutdown functions */
+        slit_shutdown();
 	client_shutdown();
         group_shutdown();
 	screen_shutdown();
 	focus_shutdown();
         moveresize_shutdown();
-        stacking_shutdown();
         frame_shutdown();
         menu_shutdown();
         grab_shutdown();
@@ -271,7 +273,8 @@ void signal_handler(const ObEvent *e, void *data)
 
     case SIGFPE:
     case SIGSEGV:
-	g_error("Caught signal %d. Aborting and dumping core.", s);
+	g_message("Caught signal %d. Aborting and dumping core.", s);
+        abort();
     }
 }