comparison: pidgin/pidginapplication.c
pidgin/pidginapplication.c
- changeset 41868
- e69cbf7921ec
- parent 41867
- 5375c1d58c50
- child 41872
- b405b4eb38fa
equal
deleted
inserted
replaced
| 41867:5375c1d58c50 | 41868:e69cbf7921ec |
|---|---|
| 744 * GApplication Implementation | 744 * GApplication Implementation |
| 745 *****************************************************************************/ | 745 *****************************************************************************/ |
| 746 static void | 746 static void |
| 747 pidgin_application_startup(GApplication *application) { | 747 pidgin_application_startup(GApplication *application) { |
| 748 PurpleAccountManager *manager = NULL; | 748 PurpleAccountManager *manager = NULL; |
| 749 GError *error = NULL; | |
| 749 GList *active_accounts = NULL; | 750 GList *active_accounts = NULL; |
| 750 gpointer handle = NULL; | 751 gpointer handle = NULL; |
| 751 | 752 |
| 752 G_APPLICATION_CLASS(pidgin_application_parent_class)->startup(application); | 753 G_APPLICATION_CLASS(pidgin_application_parent_class)->startup(application); |
| 753 | 754 |
| 778 | 779 |
| 779 #ifdef _WIN32 | 780 #ifdef _WIN32 |
| 780 winpidgin_init(); | 781 winpidgin_init(); |
| 781 #endif | 782 #endif |
| 782 | 783 |
| 783 if(!purple_core_init(pidgin_ui_new())) { | 784 if(!purple_core_init(pidgin_ui_new(), &error)) { |
| 784 fprintf(stderr, | 785 fprintf(stderr, |
| 785 _("Initialization of the libpurple core failed. Aborting!\n" | 786 _("Initialization of the libpurple core failed. %s\n" |
| 786 "Please report this!\n")); | 787 "Aborting!\nPlease report this!\n"), |
| 788 (error != NULL) ? error->message : "unknown error"); | |
| 789 g_clear_error(&error); | |
| 787 g_abort(); | 790 g_abort(); |
| 788 } | 791 } |
| 789 | 792 |
| 790 pidgin_application_init_plugins(); | 793 pidgin_application_init_plugins(); |
| 791 | 794 |
