From 559ab9c9226b5c79c31baf584b15e53a22fc8d00 Mon Sep 17 00:00:00 2001
From: Mikael Magnusson <mikachu@comhem.se>
Date: Sun, 20 May 2007 15:23:08 +0000
Subject: [PATCH] add --restart

---
 doc/openbox.1.sgml | 9 +++++++++
 openbox/openbox.c  | 3 +--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/doc/openbox.1.sgml b/doc/openbox.1.sgml
index 2e0c3c83..6921a666 100644
--- 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 ec5c7db2..f66f6a76 100644
--- 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 */