add --restart

diff --git a/doc/openbox.1.sgml b/doc/openbox.1.sgml
index 2e0c3c833039a1493685e0aa1ca8b026a33f93cf..6921a66618bd5f07980a110ec4608bbf04a807ec 100644 (file)
--- a/doc/openbox.1.sgml
+++ b/doc/openbox.1.sgml
@@ -40,6 +40,7 @@ manpage.1: manpage.sgml
       <arg><option>--version</option></arg>
       <arg><option>--replace</option></arg>
       <arg><option>--reconfigure</option></arg>
+      <arg><option>--restart</option></arg>
       <arg><option>--sm-disable</option></arg>
       <arg><option>--sync</option></arg>
       <arg><option>--debug</option></arg>
@@ -127,6 +128,14 @@ manpage.1: manpage.sgml
             reload its configuration.</para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term><option>--restart</option></term>
+        <listitem>
+          <para>If Openbox is already running on the display, tell it to
+            restart. This is useful if you have upgraded Openbox and don't
+            want to restart X.</para>
+        </listitem>
+      </varlistentry>
       <varlistentry>
         <term><option>--sm-disable</option></term>
         <listitem>

diff --git a/openbox/openbox.c b/openbox/openbox.c
index ec5c7db24355a54e3ba3e5d1a0c5f8e363fef7a7..f66f6a762e4d748f2add4314619775dbd368cbec 100644 (file)
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -477,6 +477,7 @@ static void print_help()
     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"));
@@ -542,10 +543,8 @@ static void parse_args(gint *argc, gchar **argv)
         }
         else if (!strcmp(argv[i], "--reconfigure")) {
             remote_control = 1;
-/* don't make this do anything if it's not in --help ..
         } else if (!strcmp(argv[i], "--restart")) {
             remote_control = 2;
-*/
         }
         else if (!strcmp(argv[i], "--sm-save-file")) {
             if (i == *argc - 1) /* no args left */