comparison: pidgin/gtkmain.c
pidgin/gtkmain.c
- branch
- vv
- changeset 26483
- 228a6b1f2e04
- parent 26399
- 8917621d00e2
- child 26503
- 8f0ab2bd6cf3
equal
deleted
inserted
replaced
| 26482:72d16a73cf12 | 26483:228a6b1f2e04 |
|---|---|
| 467 { | 467 { |
| 468 gboolean opt_force_online = FALSE; | 468 gboolean opt_force_online = FALSE; |
| 469 gboolean opt_help = FALSE; | 469 gboolean opt_help = FALSE; |
| 470 gboolean opt_login = FALSE; | 470 gboolean opt_login = FALSE; |
| 471 gboolean opt_nologin = FALSE; | 471 gboolean opt_nologin = FALSE; |
| 472 gboolean opt_nocrash = FALSE; | |
| 473 gboolean opt_version = FALSE; | 472 gboolean opt_version = FALSE; |
| 474 gboolean opt_si = TRUE; /* Check for single instance? */ | 473 gboolean opt_si = TRUE; /* Check for single instance? */ |
| 475 char *opt_config_dir_arg = NULL; | 474 char *opt_config_dir_arg = NULL; |
| 476 char *opt_login_arg = NULL; | 475 char *opt_login_arg = NULL; |
| 477 char *opt_session_arg = NULL; | 476 char *opt_session_arg = NULL; |
| 499 {"force-online", no_argument, NULL, 'd'}, | 498 {"force-online", no_argument, NULL, 'd'}, |
| 500 {"help", no_argument, NULL, 'h'}, | 499 {"help", no_argument, NULL, 'h'}, |
| 501 {"login", optional_argument, NULL, 'l'}, | 500 {"login", optional_argument, NULL, 'l'}, |
| 502 {"multiple", no_argument, NULL, 'm'}, | 501 {"multiple", no_argument, NULL, 'm'}, |
| 503 {"nologin", no_argument, NULL, 'n'}, | 502 {"nologin", no_argument, NULL, 'n'}, |
| 504 {"nocrash", no_argument, NULL, 'x'}, | |
| 505 {"session", required_argument, NULL, 's'}, | 503 {"session", required_argument, NULL, 's'}, |
| 506 {"version", no_argument, NULL, 'v'}, | 504 {"version", no_argument, NULL, 'v'}, |
| 507 {"display", required_argument, NULL, 'D'}, | 505 {"display", required_argument, NULL, 'D'}, |
| 508 {"sync", no_argument, NULL, 'S'}, | 506 {"sync", no_argument, NULL, 'S'}, |
| 509 {0, 0, 0, 0} | 507 {0, 0, 0, 0} |
| 648 opt_version = TRUE; | 646 opt_version = TRUE; |
| 649 break; | 647 break; |
| 650 case 'm': /* do not ensure single instance. */ | 648 case 'm': /* do not ensure single instance. */ |
| 651 opt_si = FALSE; | 649 opt_si = FALSE; |
| 652 break; | 650 break; |
| 653 case 'x': /* --nocrash */ | |
| 654 opt_nocrash = TRUE; | |
| 655 break; | |
| 656 case 'D': /* --display */ | 651 case 'D': /* --display */ |
| 657 case 'S': /* --sync */ | 652 case 'S': /* --sync */ |
| 658 /* handled by gtk_init_check below */ | 653 /* handled by gtk_init_check below */ |
| 659 break; | 654 break; |
| 660 case '?': /* show terse help */ | 655 case '?': /* show terse help */ |
