comparison: gtk/gtkmain.c
gtk/gtkmain.c
- changeset 15434
- 94dcf9e39d66
- parent 15057
- 909e807e3070
equal
deleted
inserted
replaced
| 15433:1be109687973 | 15434:94dcf9e39d66 |
|---|---|
| 339 show_usage(const char *name, gboolean terse) | 339 show_usage(const char *name, gboolean terse) |
| 340 { | 340 { |
| 341 char *text; | 341 char *text; |
| 342 | 342 |
| 343 if (terse) { | 343 if (terse) { |
| 344 text = g_strdup_printf(_("Gaim %s. Try `%s -h' for more information.\n"), VERSION, name); | 344 text = g_strdup_printf(_(PIDGIN_NAME " %s. Try `%s -h' for more information.\n"), VERSION, name); |
| 345 } else { | 345 } else { |
| 346 text = g_strdup_printf(_("Gaim %s\n" | 346 text = g_strdup_printf(_(PIDGIN_NAME " %s\n" |
| 347 "Usage: %s [OPTION]...\n\n" | 347 "Usage: %s [OPTION]...\n\n" |
| 348 " -c, --config=DIR use DIR for config files\n" | 348 " -c, --config=DIR use DIR for config files\n" |
| 349 " -d, --debug print debugging messages to stdout\n" | 349 " -d, --debug print debugging messages to stdout\n" |
| 350 " -h, --help display this help and exit\n" | 350 " -h, --help display this help and exit\n" |
| 351 " -n, --nologin don't automatically login\n" | 351 " -n, --nologin don't automatically login\n" |
| 523 #ifdef HAVE_SIGNAL_H | 523 #ifdef HAVE_SIGNAL_H |
| 524 | 524 |
| 525 #ifndef DEBUG | 525 #ifndef DEBUG |
| 526 /* We translate this here in case the crash breaks gettext. */ | 526 /* We translate this here in case the crash breaks gettext. */ |
| 527 segfault_message_tmp = g_strdup_printf(_( | 527 segfault_message_tmp = g_strdup_printf(_( |
| 528 "Gaim has segfaulted and attempted to dump a core file.\n" | 528 PIDGIN_NAME " has segfaulted and attempted to dump a core file.\n" |
| 529 "This is a bug in the software and has happened through\n" | 529 "This is a bug in the software and has happened through\n" |
| 530 "no fault of your own.\n\n" | 530 "no fault of your own.\n\n" |
| 531 "If you can reproduce the crash, please notify the gaim\n" | 531 "If you can reproduce the crash, please notify the gaim\n" |
| 532 "developers by reporting a bug at\n" | 532 "developers by reporting a bug at\n" |
| 533 "%sbug.php\n\n" | 533 "%sbug.php\n\n" |
| 652 show_usage(argv[0], FALSE); | 652 show_usage(argv[0], FALSE); |
| 653 return 0; | 653 return 0; |
| 654 } | 654 } |
| 655 /* show version message */ | 655 /* show version message */ |
| 656 if (opt_version) { | 656 if (opt_version) { |
| 657 printf("Gaim %s\n", VERSION); | 657 printf(PIDGIN_NAME " %s\n", VERSION); |
| 658 return 0; | 658 return 0; |
| 659 } | 659 } |
| 660 | 660 |
| 661 /* set a user-specified config directory */ | 661 /* set a user-specified config directory */ |
| 662 if (opt_config_dir_arg != NULL) { | 662 if (opt_config_dir_arg != NULL) { |
| 677 | 677 |
| 678 gui_check = gtk_init_check(&argc, &argv); | 678 gui_check = gtk_init_check(&argc, &argv); |
| 679 if (!gui_check) { | 679 if (!gui_check) { |
| 680 char *display = gdk_get_display(); | 680 char *display = gdk_get_display(); |
| 681 | 681 |
| 682 printf("Gaim %s\n", VERSION); | 682 printf(PIDGIN_NAME " %s\n", VERSION); |
| 683 | 683 |
| 684 g_warning("cannot open display: %s", display ? display : "unset"); | 684 g_warning("cannot open display: %s", display ? display : "unset"); |
| 685 g_free(display); | 685 g_free(display); |
| 686 | 686 |
| 687 return 1; | 687 return 1; |
| 703 g_free(search_path); | 703 g_free(search_path); |
| 704 gaim_plugins_add_search_path(LIBDIR); | 704 gaim_plugins_add_search_path(LIBDIR); |
| 705 | 705 |
| 706 if (!gaim_core_init(GAIM_GTK_UI)) { | 706 if (!gaim_core_init(GAIM_GTK_UI)) { |
| 707 fprintf(stderr, | 707 fprintf(stderr, |
| 708 "Initialization of the Gaim core failed. Dumping core.\n" | 708 "Initialization of the " PIDGIN_NAME " core failed. Dumping core.\n" |
| 709 "Please report this!\n"); | 709 "Please report this!\n"); |
| 710 abort(); | 710 abort(); |
| 711 } | 711 } |
| 712 | 712 |
| 713 /* TODO: Move blist loading into gaim_blist_init() */ | 713 /* TODO: Move blist loading into gaim_blist_init() */ |
