comparison: pidgin/gtkmain.c
pidgin/gtkmain.c
- changeset 20747
- c7494ef1530d
- parent 20098
- 601e81fbb0d9
- parent 20395
- 81c963c89157
- child 20752
- 22ffec5874b4
equal
deleted
inserted
replaced
| 20298:3e480c5ee53b | 20747:c7494ef1530d |
|---|---|
| 392 " -h, --help display this help and exit\n" | 392 " -h, --help display this help and exit\n" |
| 393 " -m, --multiple do not ensure single instance\n" | 393 " -m, --multiple do not ensure single instance\n" |
| 394 " -n, --nologin don't automatically login\n" | 394 " -n, --nologin don't automatically login\n" |
| 395 " -l, --login[=NAME] automatically login (optional argument NAME specifies\n" | 395 " -l, --login[=NAME] automatically login (optional argument NAME specifies\n" |
| 396 " account(s) to use, separated by commas)\n" | 396 " account(s) to use, separated by commas)\n" |
| 397 #ifndef WIN32 | |
| 398 " --display=DISPLAY X display to use\n" | |
| 399 #endif | |
| 397 " -v, --version display the current version and exit\n"), PIDGIN_NAME, VERSION, name); | 400 " -v, --version display the current version and exit\n"), PIDGIN_NAME, VERSION, name); |
| 398 } | 401 } |
| 399 | 402 |
| 400 purple_print_utf8_to_console(stdout, text); | 403 purple_print_utf8_to_console(stdout, text); |
| 401 g_free(text); | 404 g_free(text); |
| 479 {"login", optional_argument, NULL, 'l'}, | 482 {"login", optional_argument, NULL, 'l'}, |
| 480 {"multiple", no_argument, NULL, 'm'}, | 483 {"multiple", no_argument, NULL, 'm'}, |
| 481 {"nologin", no_argument, NULL, 'n'}, | 484 {"nologin", no_argument, NULL, 'n'}, |
| 482 {"session", required_argument, NULL, 's'}, | 485 {"session", required_argument, NULL, 's'}, |
| 483 {"version", no_argument, NULL, 'v'}, | 486 {"version", no_argument, NULL, 'v'}, |
| 487 {"display", required_argument, NULL, 'D'}, | |
| 484 {0, 0, 0, 0} | 488 {0, 0, 0, 0} |
| 485 }; | 489 }; |
| 486 | 490 |
| 487 #ifdef DEBUG | 491 #ifdef DEBUG |
| 488 debug_enabled = TRUE; | 492 debug_enabled = TRUE; |
| 624 opt_version = TRUE; | 628 opt_version = TRUE; |
| 625 break; | 629 break; |
| 626 case 'm': /* do not ensure single instance. */ | 630 case 'm': /* do not ensure single instance. */ |
| 627 opt_si = FALSE; | 631 opt_si = FALSE; |
| 628 break; | 632 break; |
| 633 case 'D': /* --display */ | |
| 634 /* handled by gtk_init_check below */ | |
| 635 break; | |
| 629 case '?': /* show terse help */ | 636 case '?': /* show terse help */ |
| 630 default: | 637 default: |
| 631 show_usage(argv[0], TRUE); | 638 show_usage(argv[0], TRUE); |
| 632 #ifdef HAVE_SIGNAL_H | 639 #ifdef HAVE_SIGNAL_H |
| 633 g_free(segfault_message); | 640 g_free(segfault_message); |
