diff options
| author | Mikael Magnusson <mikachu@comhem.se> | 2007-12-18 21:12:52 +0100 |
|---|---|---|
| committer | Mikael Magnusson <mikachu@comhem.se> | 2007-12-18 21:12:52 +0100 |
| commit | 2b8b5da04b14af1639143cc332874c7e1a03a8bb (patch) | |
| tree | 74fc76cd53dc5684b8009960e896ecbc91cf0891 /openbox/openbox.c | |
| parent | 9586ad246dae1f1de89f2070722cfa0c0c41c477 (diff) | |
| parent | 46f90bca8ab55a2f43bf33af1adf178bd0bd81d9 (diff) | |
Merge branch 'backport'
Diffstat (limited to 'openbox/openbox.c')
| -rw-r--r-- | openbox/openbox.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/openbox/openbox.c b/openbox/openbox.c index 06afffc8..6f47fbd0 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -489,6 +489,7 @@ static void print_help() 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(_(" --exit Exit Openbox\n")); g_print(_("\nDebugging options:\n")); g_print(_(" --sync Run in synchronous mode\n")); g_print(_(" --debug Display debugging output\n")); @@ -511,7 +512,7 @@ static void remove_args(gint *argc, gchar **argv, gint index, gint num) static void parse_env() { /* unset this so we don't pass it on unknowingly */ - unsetenv("DESKTOP_STARTUP_ID"); + putenv("DESKTOP_STARTUP_ID"); } static void parse_args(gint *argc, gchar **argv) @@ -554,9 +555,13 @@ static void parse_args(gint *argc, gchar **argv) } else if (!strcmp(argv[i], "--reconfigure")) { remote_control = 1; - } else if (!strcmp(argv[i], "--restart")) { + } + else if (!strcmp(argv[i], "--restart")) { remote_control = 2; } + else if (!strcmp(argv[i], "--exit")) { + remote_control = 3; + } else if (!strcmp(argv[i], "--sm-save-file")) { if (i == *argc - 1) /* no args left */ /* not translated cuz it's sekret */ |