remove focus-stealing-prevention stuff, don't use user_time crap at all. it is broken...

[chaz/openbox] / openbox / openbox.c

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 1b5fbe8cd795efa965d7115cbc2e27707a9fd9c3..06afffc8264cf31b0daa5eb61b07cac5d7ffd5a5 100644 (file)
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -42,7 +42,6 @@
 #include "menuframe.h"
 #include "grab.h"
 #include "group.h"
-#include "propwin.h"
 #include "config.h"
 #include "mainloop.h"
 #include "gettext.h"
@@ -129,7 +128,7 @@ gint main(gint argc, gchar **argv)
     if (chdir(g_get_home_dir()) == -1)
         g_message(_("Unable to change to home directory '%s': %s"),
                   g_get_home_dir(), g_strerror(errno));
-     
+
     /* parse the command line args, which can change the argv[0] */
     parse_args(&argc, argv);
     /* parse the environment variables */
@@ -147,8 +146,7 @@ gint main(gint argc, gchar **argv)
 
     ob_display = XOpenDisplay(NULL);
     if (ob_display == NULL)
-        ob_exit_with_error(_("Failed to open the display from the DISPLAY "
-                             "environment variable."));
+        ob_exit_with_error(_("Failed to open the display from the DISPLAY environment variable."));
     if (fcntl(ConnectionNumber(ob_display), F_SETFD, 1) == -1)
         ob_exit_with_error("Failed to set display as close-on-exec");
 
@@ -156,7 +154,7 @@ gint main(gint argc, gchar **argv)
         prop_startup();
 
         /* Send client message telling the OB process to:
-         * remote_control = 1 -> reconfigure 
+         * remote_control = 1 -> reconfigure
          * remote_control = 2 -> restart */
         PROP_MSG(RootWindow(ob_display, ob_screen),
                  ob_control, remote_control, 0, 0, 0);
@@ -250,8 +248,7 @@ gint main(gint argc, gchar **argv)
                     parse_tree(i, doc, node->xmlChildrenNode);
                     parse_close(doc);
                 } else
-                    g_message(_("Unable to find a valid config file, "
-                                "using some simple defaults"));
+                    g_message(_("Unable to find a valid config file, using some simple defaults"));
 
 /*
                 if (config_type != NULL)
@@ -303,7 +300,6 @@ gint main(gint argc, gchar **argv)
             sn_startup(reconfigure);
             screen_startup(reconfigure);
             grab_startup(reconfigure);
-            propwin_startup(reconfigure);
             group_startup(reconfigure);
             client_startup(reconfigure);
             dock_startup(reconfigure);
@@ -365,7 +361,6 @@ gint main(gint argc, gchar **argv)
             dock_shutdown(reconfigure);
             client_shutdown(reconfigure);
             group_shutdown(reconfigure);
-            propwin_shutdown(reconfigure);
             grab_shutdown(reconfigure);
             screen_shutdown(reconfigure);
             focus_cycle_popup_shutdown(reconfigure);
@@ -445,7 +440,7 @@ gint main(gint argc, gchar **argv)
     g_free(ob_sm_save_file);
     g_free(ob_sm_id);
     g_free(program_name);
-     
+
     return exitcode;
 }
 
@@ -458,7 +453,7 @@ static void signal_handler(gint signal, gpointer data)
         break;
     case SIGUSR2:
         ob_debug("Caught signal %d. Reconfiguring.\n", signal);
-        ob_reconfigure(); 
+        ob_reconfigure();
         break;
     case SIGCHLD:
         /* reap children */
@@ -489,20 +484,16 @@ static void print_help()
     g_print(_("\nOptions:\n"));
     g_print(_("  --help              Display this help and exit\n"));
     g_print(_("  --version           Display the version and exit\n"));
-    g_print(_("  --replace           Replace the currently running "
-                                     "window manager\n"));
-    g_print(_("  --sm-disable        Disable connection to the "
-                                     "session manager\n"));
+    g_print(_("  --replace           Replace the currently running window manager\n"));
+    g_print(_("  --sm-disable        Disable connection to the session manager\n"));
     g_print(_("\nPassing messages to a running Openbox instance:\n"));
     g_print(_("  --reconfigure       Reload Openbox's configuration\n"));
     g_print(_("  --restart           Restart Openbox\n"));
     g_print(_("\nDebugging options:\n"));
     g_print(_("  --sync              Run in synchronous mode\n"));
     g_print(_("  --debug             Display debugging output\n"));
-    g_print(_("  --debug-focus       Display debugging output for "
-                                     "focus handling\n"));
-    g_print(_("  --debug-xinerama    Split the display into fake "
-                                     "xinerama screens\n"));
+    g_print(_("  --debug-focus       Display debugging output for focus handling\n"));
+    g_print(_("  --debug-xinerama    Split the display into fake xinerama screens\n"));
     g_print(_("\nPlease report bugs at %s\n"), PACKAGE_BUGREPORT);
 }