X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=ca02d8bde01748a737c127077596969d960bd895;hb=dcdc325f5c8c946df696d17a6da329aeac149586;hp=5c28fcf626d2c45f48c20df1b053a7103cc112fa;hpb=1045079482453424f8320de99639390e3020eb72;p=chaz%2Fopenbox

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 5c28fcf6..ca02d8bd 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -5,7 +5,6 @@
 #include "event.h"
 #include "menu.h"
 #include "client.h"
-#include "dispatch.h"
 #include "xerror.h"
 #include "prop.h"
 #include "startup.h"
@@ -17,7 +16,6 @@
 #include "mouse.h"
 #include "extensions.h"
 #include "grab.h"
-#include "plugin.h"
 #include "timer.h"
 #include "group.h"
 #include "config.h"
@@ -66,7 +64,7 @@ static Cursor    cursors[OB_NUM_CURSORS];
 static KeyCode   keys[OB_NUM_KEYS];
 static gchar    *sm_save_file;
 
-static void signal_handler(const ObEvent *e, void *data);
+static void signal_handler(int signal);
 static void parse_args(int argc, char **argv);
 
 int main(int argc, char **argv)
@@ -90,13 +88,9 @@ int main(int argc, char **argv)
     bind_textdomain_codeset(PACKAGE_NAME, "UTF-8");
     textdomain(PACKAGE_NAME);
 
-    /* start our event dispatcher and register for signals */
-    dispatch_startup();
-    dispatch_register(Event_Signal, signal_handler, NULL);
-
     /* set up signal handler */
     sigemptyset(&sigset);
-    action.sa_handler = dispatch_signal;
+    action.sa_handler = signal_handler;
     action.sa_mask = sigset;
     action.sa_flags = SA_NOCLDSTOP | SA_NODEFER;
     sigaction(SIGUSR1, &action, (struct sigaction *) NULL);
@@ -224,21 +218,16 @@ 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);
         /* we're done with parsing now, kill it */
+        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)
@@ -251,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();
@@ -266,7 +253,7 @@ 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();
         dock_shutdown();
@@ -275,7 +262,6 @@ int main(int argc, char **argv)
 	screen_shutdown();
 	focus_shutdown();
         moveresize_shutdown();
-        menu_shutdown();
         window_shutdown();
         grab_shutdown();
 	event_shutdown();
@@ -283,14 +269,16 @@ int main(int argc, char **argv)
         config_shutdown();
     }
 
-    dispatch_shutdown();
-
     RrThemeFree(ob_rr_theme);
     RrInstanceFree(ob_rr_inst);
 
     session_shutdown();
     g_free(ob_sm_id);
 
+#ifdef USE_LIBSN
+    sn_display_unref(ob_sn_display);
+#endif
+
     XCloseDisplay(ob_display);
 
     if (restart) {
@@ -316,12 +304,9 @@ int main(int argc, char **argv)
     return 0;
 }
 
-static void signal_handler(const ObEvent *e, void *data)
+static void signal_handler(int sig)
 {
-    int s;
-
-    s = e->data.s.signal;
-    switch (s) {
+    switch (sig) {
     case SIGUSR1:
 	fprintf(stderr, "Caught SIGUSR1 signal. Restarting.");
         ob_restart();
@@ -331,13 +316,13 @@ static void signal_handler(const ObEvent *e, void *data)
     case SIGINT:
     case SIGTERM:
     case SIGPIPE:
-	fprintf(stderr, "Caught signal %d. Exiting.", s);
+	fprintf(stderr, "Caught signal %d. Exiting.", sig);
         ob_exit();
 	break;
 
     case SIGFPE:
     case SIGSEGV:
-        fprintf(stderr, "Caught signal %d. Aborting and dumping core.", s);
+        fprintf(stderr, "Caught signal %d. Aborting and dumping core.", sig);
         abort();
     }
 }