diff options
| author | Dana Jansens <danakj@orodu.net> | 2007-05-13 19:23:37 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2007-05-13 19:23:37 +0000 |
| commit | ecde8e8f731cf397ab82ce59aab0e18a50af70c0 (patch) | |
| tree | 24b93edf3d37a97c6f1438937b4faa5afd81dbca | |
| parent | e28cbd61c121b989b5cd183122b998691ceafc93 (diff) | |
reorganize --help. dont error if they use a --sm stuff and sm isn't enabled
| -rw-r--r-- | openbox/openbox.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/openbox/openbox.c b/openbox/openbox.c index aee2bcd6..d5501564 100644 --- a/openbox/openbox.c +++ b/openbox/openbox.c @@ -457,13 +457,11 @@ static void print_help() { g_print(_("Syntax: openbox [options]\n")); g_print(_("\nOptions:\n")); - g_print(_(" --config TYPE Specify the configuration profile to use\n")); -#ifdef USE_SM - g_print(_(" --sm-disable Disable connection to the session manager\n")); -#endif - g_print(_(" --replace Replace the currently running window manager\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(_(" --config TYPE Specify the configuration profile to use\n")); g_print(_("\nPassing messages to a running Openbox instance:\n")); g_print(_(" --reconfigure Reload Openbox's configuration\n")); g_print(_("\nDebugging options:\n")); @@ -534,7 +532,6 @@ static void parse_args(gint *argc, gchar **argv) ++i; } } -#ifdef USE_SM else if (!strcmp(argv[i], "--sm-save-file")) { if (i == *argc - 1) /* no args left */ /* not translated cuz it's sekret */ @@ -561,7 +558,6 @@ static void parse_args(gint *argc, gchar **argv) else if (!strcmp(argv[i], "--sm-disable")) { ob_sm_use = FALSE; } -#endif else { /* this is a memleak.. oh well.. heh */ gchar *err = g_strdup_printf |