send unfocus events after focus events

[chaz/openbox] / openbox / openbox.c

diff --git a/openbox/openbox.c b/openbox/openbox.c
index b10659297e48d616b474728154bfe73813b9ec5a..bf8913bc1bcab5c70424f6299ea8c46007df4370 100644 (file)
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -140,7 +140,8 @@ int main(int argc, char **argv)
         plugin_startup();
 
         /* XXX load all plugins!! */
-        plugin_open("foo");
+        plugin_open("focus");
+        plugin_open("keyboard");
 
        /* get all the existing windows */
        client_manage_all();
@@ -174,7 +175,10 @@ int main(int argc, char **argv)
 
 void signal_handler(const ObEvent *e, void *data)
 {
-    switch (e->data.signal) {
+    int s;
+
+    s = e->data.s.signal;
+    switch (s) {
     case SIGUSR1:
        g_message("Caught SIGUSR1 signal. Restarting.");
        ob_shutdown = ob_restart = TRUE;
@@ -188,12 +192,12 @@ void signal_handler(const ObEvent *e, void *data)
     case SIGINT:
     case SIGTERM:
     case SIGPIPE:
-       g_message("Caught signal %d. Exiting.", e->data.signal);
+       g_message("Caught signal %d. Exiting.", s);
        ob_shutdown = TRUE;
        break;
 
     case SIGFPE:
     case SIGSEGV:
-       g_error("Caught signal %d. Aborting and dumping core.",e->data.signal);
+       g_error("Caught signal %d. Aborting and dumping core.", s);
     }
 }