rename "Slit" to "Dock".

[chaz/openbox] / openbox / openbox.c

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 304d52c6f27abe3c7332458bdec5a82bd509af0b..93e91a59816d0a64f2980e992fa511df5d51e5b2 100644 (file)
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -1,4 +1,5 @@
 #include "openbox.h"
+#include "dock.h"
 #include "event.h"
 #include "menu.h"
 #include "client.h"
@@ -183,14 +184,15 @@ int main(int argc, char **argv)
         g_free(theme);
         if (!theme) return 1;
 
+        window_startup();
         menu_startup();
         frame_startup();
-        stacking_startup();
         moveresize_startup();
        focus_startup();
        screen_startup();
         group_startup();
        client_startup();
+        dock_startup();
 
         /* call startup for all the plugins */
         plugin_startall();
@@ -203,17 +205,19 @@ int main(int argc, char **argv)
            event_loop();
        ob_state = State_Exiting;
 
+        dock_remove_all();
        client_unmanage_all();
 
         plugin_shutdown(); /* calls all the plugins' shutdown functions */
+        dock_shutdown();
        client_shutdown();
         group_shutdown();
        screen_shutdown();
        focus_shutdown();
         moveresize_shutdown();
-        stacking_shutdown();
         frame_shutdown();
         menu_shutdown();
+        window_shutdown();
         grab_shutdown();
        event_shutdown();
         theme_shutdown();
@@ -271,7 +275,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();
     }
 }