comparison: pidgin/gtkmain.c
pidgin/gtkmain.c
- branch
- custom_smiley
- changeset 22557
- a009a7319294
- parent 22443
- 7b8772af6bb7
- parent 22549
- 92a0703c0cba
- child 22651
- 72d47896d80d
equal
deleted
inserted
replaced
| 22452:ab437cdb5943 | 22557:a009a7319294 |
|---|---|
| 300 } | 300 } |
| 301 | 301 |
| 302 static void | 302 static void |
| 303 pidgin_ui_init(void) | 303 pidgin_ui_init(void) |
| 304 { | 304 { |
| 305 pidgin_stock_init(); | |
| 306 | |
| 305 /* Set the UI operation structures. */ | 307 /* Set the UI operation structures. */ |
| 306 purple_accounts_set_ui_ops(pidgin_accounts_get_ui_ops()); | 308 purple_accounts_set_ui_ops(pidgin_accounts_get_ui_ops()); |
| 307 purple_xfers_set_ui_ops(pidgin_xfers_get_ui_ops()); | 309 purple_xfers_set_ui_ops(pidgin_xfers_get_ui_ops()); |
| 308 purple_blist_set_ui_ops(pidgin_blist_get_ui_ops()); | 310 purple_blist_set_ui_ops(pidgin_blist_get_ui_ops()); |
| 309 purple_notify_set_ui_ops(pidgin_notify_get_ui_ops()); | 311 purple_notify_set_ui_ops(pidgin_notify_get_ui_ops()); |
| 314 purple_whiteboard_set_ui_ops(pidgin_whiteboard_get_ui_ops()); | 316 purple_whiteboard_set_ui_ops(pidgin_whiteboard_get_ui_ops()); |
| 315 #ifdef USE_SCREENSAVER | 317 #ifdef USE_SCREENSAVER |
| 316 purple_idle_set_ui_ops(pidgin_idle_get_ui_ops()); | 318 purple_idle_set_ui_ops(pidgin_idle_get_ui_ops()); |
| 317 #endif | 319 #endif |
| 318 | 320 |
| 319 pidgin_stock_init(); | |
| 320 pidgin_account_init(); | 321 pidgin_account_init(); |
| 321 pidgin_connection_init(); | 322 pidgin_connection_init(); |
| 322 pidgin_blist_init(); | 323 pidgin_blist_init(); |
| 323 pidgin_status_init(); | 324 pidgin_status_init(); |
| 324 pidgin_conversations_init(); | 325 pidgin_conversations_init(); |
| 406 " -c, --config=DIR use DIR for config files\n" | 407 " -c, --config=DIR use DIR for config files\n" |
| 407 " -d, --debug print debugging messages to stdout\n" | 408 " -d, --debug print debugging messages to stdout\n" |
| 408 " -h, --help display this help and exit\n" | 409 " -h, --help display this help and exit\n" |
| 409 " -m, --multiple do not ensure single instance\n" | 410 " -m, --multiple do not ensure single instance\n" |
| 410 " -n, --nologin don't automatically login\n" | 411 " -n, --nologin don't automatically login\n" |
| 411 " -l, --login[=NAME] automatically login (optional argument NAME specifies\n" | 412 " -l, --login[=NAME] enable specified account(s) (optional argument NAME\n" |
| 412 " account(s) to use, separated by commas)\n" | 413 " specifies account(s) to use, separated by commas.\n" |
| 414 " Without this only the first account will be enabled).\n" | |
| 413 " --display=DISPLAY X display to use\n" | 415 " --display=DISPLAY X display to use\n" |
| 414 " -v, --version display the current version and exit\n"), PIDGIN_NAME, DISPLAY_VERSION, name); | 416 " -v, --version display the current version and exit\n"), PIDGIN_NAME, DISPLAY_VERSION, name); |
| 415 #else | 417 #else |
| 416 text = g_strdup_printf(_("%s %s\n" | 418 text = g_strdup_printf(_("%s %s\n" |
| 417 "Usage: %s [OPTION]...\n\n" | 419 "Usage: %s [OPTION]...\n\n" |
| 418 " -c, --config=DIR use DIR for config files\n" | 420 " -c, --config=DIR use DIR for config files\n" |
| 419 " -d, --debug print debugging messages to stdout\n" | 421 " -d, --debug print debugging messages to stdout\n" |
| 420 " -h, --help display this help and exit\n" | 422 " -h, --help display this help and exit\n" |
| 421 " -m, --multiple do not ensure single instance\n" | 423 " -m, --multiple do not ensure single instance\n" |
| 422 " -n, --nologin don't automatically login\n" | 424 " -n, --nologin don't automatically login\n" |
| 423 " -l, --login[=NAME] automatically login (optional argument NAME specifies\n" | 425 " -l, --login[=NAME] enable specified account(s) (optional argument NAME\n" |
| 424 " account(s) to use, separated by commas)\n" | 426 " specifies account(s) to use, separated by commas.\n" |
| 427 " Without this only the first account will be enabled).\n" | |
| 425 " -v, --version display the current version and exit\n"), PIDGIN_NAME, DISPLAY_VERSION, name); | 428 " -v, --version display the current version and exit\n"), PIDGIN_NAME, DISPLAY_VERSION, name); |
| 426 #endif | 429 #endif |
| 427 } | 430 } |
| 428 | 431 |
| 429 purple_print_utf8_to_console(stdout, text); | 432 purple_print_utf8_to_console(stdout, text); |
| 476 #endif | 479 #endif |
| 477 { | 480 { |
| 478 gboolean opt_help = FALSE; | 481 gboolean opt_help = FALSE; |
| 479 gboolean opt_login = FALSE; | 482 gboolean opt_login = FALSE; |
| 480 gboolean opt_nologin = FALSE; | 483 gboolean opt_nologin = FALSE; |
| 484 gboolean opt_nocrash = FALSE; | |
| 481 gboolean opt_version = FALSE; | 485 gboolean opt_version = FALSE; |
| 482 gboolean opt_si = TRUE; /* Check for single instance? */ | 486 gboolean opt_si = TRUE; /* Check for single instance? */ |
| 483 char *opt_config_dir_arg = NULL; | 487 char *opt_config_dir_arg = NULL; |
| 484 char *opt_login_arg = NULL; | 488 char *opt_login_arg = NULL; |
| 485 char *opt_session_arg = NULL; | 489 char *opt_session_arg = NULL; |
| 506 {"debug", no_argument, NULL, 'd'}, | 510 {"debug", no_argument, NULL, 'd'}, |
| 507 {"help", no_argument, NULL, 'h'}, | 511 {"help", no_argument, NULL, 'h'}, |
| 508 {"login", optional_argument, NULL, 'l'}, | 512 {"login", optional_argument, NULL, 'l'}, |
| 509 {"multiple", no_argument, NULL, 'm'}, | 513 {"multiple", no_argument, NULL, 'm'}, |
| 510 {"nologin", no_argument, NULL, 'n'}, | 514 {"nologin", no_argument, NULL, 'n'}, |
| 515 {"nocrash", no_argument, NULL, 'x'}, | |
| 511 {"session", required_argument, NULL, 's'}, | 516 {"session", required_argument, NULL, 's'}, |
| 512 {"version", no_argument, NULL, 'v'}, | 517 {"version", no_argument, NULL, 'v'}, |
| 513 {"display", required_argument, NULL, 'D'}, | 518 {"display", required_argument, NULL, 'D'}, |
| 514 {"sync", no_argument, NULL, 'S'}, | 519 {"sync", no_argument, NULL, 'S'}, |
| 515 {0, 0, 0, 0} | 520 {0, 0, 0, 0} |
| 655 opt_version = TRUE; | 660 opt_version = TRUE; |
| 656 break; | 661 break; |
| 657 case 'm': /* do not ensure single instance. */ | 662 case 'm': /* do not ensure single instance. */ |
| 658 opt_si = FALSE; | 663 opt_si = FALSE; |
| 659 break; | 664 break; |
| 665 case 'x': /* --nocrash */ | |
| 666 opt_nocrash = TRUE; | |
| 667 break; | |
| 660 case 'D': /* --display */ | 668 case 'D': /* --display */ |
| 661 case 'S': /* --sync */ | 669 case 'S': /* --sync */ |
| 662 /* handled by gtk_init_check below */ | 670 /* handled by gtk_init_check below */ |
| 663 break; | 671 break; |
| 664 case '?': /* show terse help */ | 672 case '?': /* show terse help */ |
