80 cols everywhere

[chaz/openbox] / openbox / openbox.c

diff --git a/openbox/openbox.c b/openbox/openbox.c
index e8d5ae4ddfab1dd05234068adbc99dcf38e46e2b..1b5fbe8cd795efa965d7115cbc2e27707a9fd9c3 100644 (file)
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -28,6 +28,7 @@
 #include "xerror.h"
 #include "prop.h"
 #include "screen.h"
+#include "actions.h"
 #include "startupnotify.h"
 #include "focus.h"
 #include "focus_cycle.h"
@@ -146,7 +147,8 @@ 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");
 
@@ -238,6 +240,8 @@ gint main(gint argc, gchar **argv)
                    of the rc */
                 i = parse_startup();
 
+                /* register all the available actions */
+                actions_startup(reconfigure);
                 /* start up config which sets up with the parser */
                 config_startup(i);
 
@@ -246,7 +250,8 @@ 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)
@@ -337,7 +342,7 @@ gint main(gint argc, gchar **argv)
                     frame_adjust_area(c->frame, TRUE, TRUE, FALSE);
                     /* the decor sizes may have changed, so the windows may
                        end up in new positions */
-                    client_reconfigure(c);
+                    client_reconfigure(c, FALSE);
                 }
             }
 
@@ -371,6 +376,7 @@ gint main(gint argc, gchar **argv)
             window_shutdown(reconfigure);
             event_shutdown(reconfigure);
             config_shutdown();
+            actions_shutdown(reconfigure);
             modkeys_shutdown(reconfigure);
         } while (reconfigure);
     }
@@ -483,16 +489,20 @@ 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);
 }