X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=fa31204fc9e178494840a15b3ef2255dccd9e210;hb=1dec895d2efccb92de83eeb4278321f699c9b1e5;hp=b32977b13d7260ed8352eb121938208a14961ac5;hpb=9f68b12062bfa5e68c00db8a74ca58998661a13b;p=chaz%2Fopenbox

diff --git a/openbox/openbox.c b/openbox/openbox.c
index b32977b1..fa31204f 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -11,7 +11,6 @@
 #include "config.h"
 #include "grab.h"
 #include "engine.h"
-#include "themerc.h"
 #include "plugin.h"
 #include "timer.h"
 #include "../render/render.h"
@@ -50,7 +49,7 @@ State    ob_state;
 gboolean ob_shutdown = FALSE;
 gboolean ob_restart  = FALSE;
 char    *ob_restart_path = NULL;
-gboolean ob_remote   = FALSE;
+gboolean ob_remote   = TRUE;
 gboolean ob_sync     = FALSE;
 Cursors  ob_cursors;
 char    *ob_rc_path  = NULL;
@@ -147,23 +146,22 @@ int main(int argc, char **argv)
         config_startup();
 	render_startup();
 	font_startup();
-	themerc_startup();
+        plugin_startup();
+
+        /* load the plugins specified in the pluginrc */
+        plugin_loadall();
+        /* parse/load user options */
+        config_parse();
+
 	engine_startup();
 	event_startup();
 	screen_startup();
 	focus_startup();
 	client_startup();
         grab_startup();
-        plugin_startup();
-
-        /* XXX load all plugins!! */
-        plugin_open("focus");
-        plugin_open("keyboard");
-        plugin_open("mouse");
-        plugin_open("placement");
-        plugin_open("resistance");
 
-        config_parse();
+        /* call startup for all the plugins */
+        plugin_startall();
 
 	/* get all the existing windows */
 	client_manage_all();
@@ -182,7 +180,6 @@ int main(int argc, char **argv)
 	screen_shutdown();
 	event_shutdown();
 	engine_shutdown();
-	themerc_shutdown();
 	render_shutdown();
         config_shutdown();
 	timer_shutdown();