From: Mikael Magnusson Date: Sun, 20 May 2007 15:23:08 +0000 (+0000) Subject: add --restart X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=559ab9c9226b5c79c31baf584b15e53a22fc8d00;p=chaz%2Fopenbox add --restart --- 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 + @@ -127,6 +128,14 @@ manpage.1: manpage.sgml reload its configuration. + + + + 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. + + 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 */