X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=ca02d8bde01748a737c127077596969d960bd895;hb=dcdc325f5c8c946df696d17a6da329aeac149586;hp=59ba762779005965f845304bb467822eb4e85937;hpb=3c5f6db04cb577fa3f547b45283eac7a0664be39;p=chaz%2Fopenbox

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 59ba7627..ca02d8bd 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -16,7 +16,6 @@
 #include "mouse.h"
 #include "extensions.h"
 #include "grab.h"
-#include "plugin.h"
 #include "timer.h"
 #include "group.h"
 #include "config.h"
@@ -219,13 +218,9 @@ int main(int argc, char **argv)
            anything that calls stacking_add */
 	focus_startup();
         window_startup();
-        plugin_startup();
-        /* load the plugins specified in the pluginrc */
-        plugin_loadall(i);
 
         /* set up the kernel config shit */
         config_startup(i);
-        menu_startup(i);
         /* parse/load user options */
         if (parse_load_rc(&doc, &node))
             parse_tree(i, doc, node->xmlChildrenNode);
@@ -233,8 +228,6 @@ int main(int argc, char **argv)
         xmlFreeDoc(doc);
         parse_shutdown(i);
 
-        menu_parse();
-
         /* load the theme specified in the rc file */
         ob_rr_theme = RrThemeNew(ob_rr_inst, config_theme);
         if (ob_rr_theme == NULL)
@@ -247,9 +240,7 @@ int main(int argc, char **argv)
         dock_startup();
         keyboard_startup();
         mouse_startup();
-
-        /* call startup for all the plugins */
-        plugin_startall();
+        menu_startup();
 
 	/* get all the existing windows */
 	client_manage_all();
@@ -262,7 +253,6 @@ int main(int argc, char **argv)
         dock_remove_all();
 	client_unmanage_all();
 
-        plugin_shutdown(); /* calls all the plugins' shutdown functions */
         menu_shutdown();
         mouse_shutdown();
         keyboard_shutdown();