rename "Slit" to "Dock".

[chaz/openbox] / openbox / openbox.c

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 1f5ded49a184954b9184114cb87a5957bc78fc70..93e91a59816d0a64f2980e992fa511df5d51e5b2 100644 (file)
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -1,10 +1,12 @@
 #include "openbox.h"
+#include "dock.h"
 #include "event.h"
 #include "menu.h"
 #include "client.h"
 #include "dispatch.h"
 #include "xerror.h"
 #include "prop.h"
+#include "startup.h"
 #include "screen.h"
 #include "focus.h"
 #include "moveresize.h"
@@ -151,6 +153,9 @@ int main(int argc, char **argv)
     prop_startup(); /* get atoms values for the display */
     extensions_query_all(); /* find which extensions are present */
 
+    /* save stuff that we can use to restore state */
+    startup_save();
+
     if (screen_annex()) { /* it will be ours! */
         /* startup the parsing so everything can register sections of the rc */
         parse_startup();
@@ -162,7 +167,6 @@ int main(int argc, char **argv)
        font_startup();
         theme_startup();
        event_startup();
-        moveresize_startup();
         grab_startup();
         plugin_startup();
         /* load the plugins specified in the pluginrc */
@@ -180,13 +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();
@@ -199,16 +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();
-        stacking_shutdown();
+        moveresize_shutdown();
         frame_shutdown();
         menu_shutdown();
+        window_shutdown();
         grab_shutdown();
        event_shutdown();
         theme_shutdown();
@@ -266,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();
     }
 }