all my changes while i was offline.

[chaz/openbox] / openbox / openbox.c

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 1f5ded49a184954b9184114cb87a5957bc78fc70..304d52c6f27abe3c7332458bdec5a82bd509af0b 100644 (file)
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -5,6 +5,7 @@
 #include "dispatch.h"
 #include "xerror.h"
 #include "prop.h"
+#include "startup.h"
 #include "screen.h"
 #include "focus.h"
 #include "moveresize.h"
@@ -151,6 +152,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 +166,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 */
@@ -183,6 +186,7 @@ int main(int argc, char **argv)
         menu_startup();
         frame_startup();
         stacking_startup();
+        moveresize_startup();
        focus_startup();
        screen_startup();
         group_startup();
@@ -206,6 +210,7 @@ int main(int argc, char **argv)
         group_shutdown();
        screen_shutdown();
        focus_shutdown();
+        moveresize_shutdown();
         stacking_shutdown();
         frame_shutdown();
         menu_shutdown();