comparison: pidgin/gtkmain.c
pidgin/gtkmain.c
- branch
- release-2.1.0
- changeset 18186
- 4bafc3287a2f
- parent 18122
- 9bf9970c1b6a
- child 18188
- 40ea50298780
equal
deleted
inserted
replaced
| 18177:6733196cafc6 | 18186:4bafc3287a2f |
|---|---|
| 125 purple_account_connect(account); | 125 purple_account_connect(account); |
| 126 } | 126 } |
| 127 } | 127 } |
| 128 g_strfreev(names); | 128 g_strfreev(names); |
| 129 } else { /* no name given, use the first account */ | 129 } else { /* no name given, use the first account */ |
| 130 const GList *accounts; | 130 GList *accounts; |
| 131 | 131 |
| 132 accounts = purple_accounts_get_all(); | 132 accounts = purple_accounts_get_all(); |
| 133 if (accounts != NULL) | 133 if (accounts != NULL) |
| 134 { | 134 { |
| 135 account = (PurpleAccount *)accounts->data; | 135 account = (PurpleAccount *)accounts->data; |
| 439 char *opt_config_dir_arg = NULL; | 439 char *opt_config_dir_arg = NULL; |
| 440 char *opt_login_arg = NULL; | 440 char *opt_login_arg = NULL; |
| 441 char *opt_session_arg = NULL; | 441 char *opt_session_arg = NULL; |
| 442 int dologin_ret = -1; | 442 int dologin_ret = -1; |
| 443 char *search_path; | 443 char *search_path; |
| 444 const GList *accounts; | 444 GList *accounts; |
| 445 #ifdef HAVE_SIGNAL_H | 445 #ifdef HAVE_SIGNAL_H |
| 446 int sig_indx; /* for setting up signal catching */ | 446 int sig_indx; /* for setting up signal catching */ |
| 447 sigset_t sigset; | 447 sigset_t sigset; |
| 448 RETSIGTYPE (*prev_sig_disp)(int); | 448 RETSIGTYPE (*prev_sig_disp)(int); |
| 449 char errmsg[BUFSIZ]; | 449 char errmsg[BUFSIZ]; |
| 454 #endif | 454 #endif |
| 455 int opt; | 455 int opt; |
| 456 gboolean gui_check; | 456 gboolean gui_check; |
| 457 gboolean debug_enabled; | 457 gboolean debug_enabled; |
| 458 gboolean migration_failed = FALSE; | 458 gboolean migration_failed = FALSE; |
| 459 GList *active_accounts; | |
| 460 | 459 |
| 461 struct option long_options[] = { | 460 struct option long_options[] = { |
| 462 {"config", required_argument, NULL, 'c'}, | 461 {"config", required_argument, NULL, 'c'}, |
| 463 {"debug", no_argument, NULL, 'd'}, | 462 {"debug", no_argument, NULL, 'd'}, |
| 464 {"help", no_argument, NULL, 'h'}, | 463 {"help", no_argument, NULL, 'h'}, |
| 827 if (!purple_prefs_get_bool("/purple/savedstatus/startup_current_status")) | 826 if (!purple_prefs_get_bool("/purple/savedstatus/startup_current_status")) |
| 828 purple_savedstatus_activate(purple_savedstatus_get_startup()); | 827 purple_savedstatus_activate(purple_savedstatus_get_startup()); |
| 829 purple_accounts_restore_current_statuses(); | 828 purple_accounts_restore_current_statuses(); |
| 830 } | 829 } |
| 831 | 830 |
| 832 if ((active_accounts = purple_accounts_get_all_active()) == NULL) | 831 if ((accounts = purple_accounts_get_all_active()) == NULL) |
| 833 { | 832 { |
| 834 pidgin_accounts_window_show(); | 833 pidgin_accounts_window_show(); |
| 835 } | 834 } |
| 836 else | 835 else |
| 837 { | 836 { |
| 838 g_list_free(active_accounts); | 837 g_list_free(accounts); |
| 839 } | 838 } |
| 840 | 839 |
| 841 #ifdef HAVE_STARTUP_NOTIFICATION | 840 #ifdef HAVE_STARTUP_NOTIFICATION |
| 842 startup_notification_complete(); | 841 startup_notification_complete(); |
| 843 #endif | 842 #endif |
