X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=3b2a999111c8b7371da971091a5ab425ef755554;hb=2b2beddc7447197d12fcbcae96772e1f38eef138;hp=505dffbc7d0d0622cc1b1f15e6bc2fcb6058f447;hpb=58cfbb7f8419e084af6b6b8b00c88ed270c29e88;p=chaz%2Fopenbox

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 505dffbc..3b2a9991 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -1,5 +1,5 @@
 #include "openbox.h"
-#include "slit.h"
+#include "dock.h"
 #include "event.h"
 #include "menu.h"
 #include "client.h"
@@ -118,7 +118,11 @@ int main(int argc, char **argv)
 	g_critical("Failed to set display as close-on-exec.");
 	exit(1);
     }
-	  
+
+#ifdef USE_LIBSN
+    ob_sn_display = sn_display_new(ob_display, NULL, NULL);
+#endif
+
     ob_screen = DefaultScreen(ob_display);
     ob_root = RootWindow(ob_display, ob_screen);
 
@@ -140,6 +144,7 @@ int main(int argc, char **argv)
     putenv(g_strdup_printf("DISPLAY=%s", DisplayString(ob_display)));
 
     ob_cursors.ptr = XCreateFontCursor(ob_display, XC_left_ptr);
+    ob_cursors.busy = XCreateFontCursor(ob_display, XC_watch);
     ob_cursors.move = XCreateFontCursor(ob_display, XC_fleur);
     ob_cursors.tl = XCreateFontCursor(ob_display, XC_top_left_corner);
     ob_cursors.tr = XCreateFontCursor(ob_display, XC_top_right_corner);
@@ -184,6 +189,7 @@ int main(int argc, char **argv)
         g_free(theme);
         if (!theme) return 1;
 
+        window_startup();
         menu_startup();
         frame_startup();
         moveresize_startup();
@@ -191,7 +197,7 @@ int main(int argc, char **argv)
 	screen_startup();
         group_startup();
 	client_startup();
-        slit_startup();
+        dock_startup();
 
         /* call startup for all the plugins */
         plugin_startall();
@@ -204,11 +210,11 @@ int main(int argc, char **argv)
 	    event_loop();
 	ob_state = State_Exiting;
 
-        slit_remove_all();
+        dock_remove_all();
 	client_unmanage_all();
 
         plugin_shutdown(); /* calls all the plugins' shutdown functions */
-        slit_shutdown();
+        dock_shutdown();
 	client_shutdown();
         group_shutdown();
 	screen_shutdown();
@@ -216,6 +222,7 @@ int main(int argc, char **argv)
         moveresize_shutdown();
         frame_shutdown();
         menu_shutdown();
+        window_shutdown();
         grab_shutdown();
 	event_shutdown();
         theme_shutdown();