Mercurial > pidgin
changeset 22413:b77c8a87e15e
Correct documentation in --help and man page for -l command line option.
Fixes #5076
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Tue, 04 Mar 2008 16:23:07 +0000 |
| parents | 75d53b0fae6c |
| children | 67f62f55fc5a |
| files | doc/pidgin.1.in pidgin/gtkmain.c |
| diffstat | 2 files changed, 14 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/pidgin.1.in Tue Mar 04 09:41:44 2008 +0000 +++ b/doc/pidgin.1.in Tue Mar 04 16:23:07 2008 +0000 @@ -57,9 +57,9 @@ \fBOffline\fR. .TP .B \-l, \-\-login[=\fINAME\fR,\fINAME\fR,...] -Sign in the comma-separated list of accounts provided, in addition to the -accounts that would be logged in anyway. If the user does not specify such a -comma-separated list, the first account in accounts.xml will be signed in. +Enable the comma-separated list of accounts provided, disabling all other +accounts. If the user does not specify such a comma-separated list, the +first account in accounts.xml will be enabled. .TP .B \-v, \-\-version Print the current version and exit.
--- a/pidgin/gtkmain.c Tue Mar 04 09:41:44 2008 +0000 +++ b/pidgin/gtkmain.c Tue Mar 04 16:23:07 2008 +0000 @@ -406,8 +406,9 @@ " -h, --help display this help and exit\n" " -m, --multiple do not ensure single instance\n" " -n, --nologin don't automatically login\n" - " -l, --login[=NAME] automatically login (optional argument NAME specifies\n" - " account(s) to use, separated by commas)\n" + " -l, --login[=NAME] enable specified account(s) (optional argument NAME\n" + " specifies account(s) to use, separated by commas.\n" + " Without this only the first account will be enabled).\n" " --display=DISPLAY X display to use\n" " -v, --version display the current version and exit\n"), PIDGIN_NAME, DISPLAY_VERSION, name); #else @@ -418,8 +419,9 @@ " -h, --help display this help and exit\n" " -m, --multiple do not ensure single instance\n" " -n, --nologin don't automatically login\n" - " -l, --login[=NAME] automatically login (optional argument NAME specifies\n" - " account(s) to use, separated by commas)\n" + " -l, --login[=NAME] enable specified account(s) (optional argument NAME\n" + " specifies account(s) to use, separated by commas.\n" + " Without this only the first account will be enabled).\n" " -v, --version display the current version and exit\n"), PIDGIN_NAME, DISPLAY_VERSION, name); #endif } @@ -476,6 +478,7 @@ gboolean opt_help = FALSE; gboolean opt_login = FALSE; gboolean opt_nologin = FALSE; + gboolean opt_nocrash = FALSE; gboolean opt_version = FALSE; gboolean opt_si = TRUE; /* Check for single instance? */ char *opt_config_dir_arg = NULL; @@ -506,6 +509,7 @@ {"login", optional_argument, NULL, 'l'}, {"multiple", no_argument, NULL, 'm'}, {"nologin", no_argument, NULL, 'n'}, + {"nocrash", no_argument, NULL, 'x'}, {"session", required_argument, NULL, 's'}, {"version", no_argument, NULL, 'v'}, {"display", required_argument, NULL, 'D'}, @@ -655,6 +659,9 @@ case 'm': /* do not ensure single instance. */ opt_si = FALSE; break; + case 'x': /* --nocrash */ + opt_nocrash = TRUE; + break; case 'D': /* --display */ case 'S': /* --sync */ /* handled by gtk_init_check below */