comparison pidgin/gtkmain.c @ 18116:ee0899360e8b

Re-apply a good change from 1411afd7660760db59966c3a9f18e2adab8eb27e: Use a separate variable for a list which is going to be g_list_free()d, so it's more clear what is happening.
author Richard Laager <rlaager@wiktel.com>
date Sat, 16 Jun 2007 19:09:52 +0000
parents 926ccb104da0
children 59aec2d6ec43
comparison
equal deleted inserted replaced
18115:871d9aa8e51c 18116:ee0899360e8b
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;
459 460
460 struct option long_options[] = { 461 struct option long_options[] = {
461 {"config", required_argument, NULL, 'c'}, 462 {"config", required_argument, NULL, 'c'},
462 {"debug", no_argument, NULL, 'd'}, 463 {"debug", no_argument, NULL, 'd'},
463 {"help", no_argument, NULL, 'h'}, 464 {"help", no_argument, NULL, 'h'},
826 if (!purple_prefs_get_bool("/purple/savedstatus/startup_current_status")) 827 if (!purple_prefs_get_bool("/purple/savedstatus/startup_current_status"))
827 purple_savedstatus_activate(purple_savedstatus_get_startup()); 828 purple_savedstatus_activate(purple_savedstatus_get_startup());
828 purple_accounts_restore_current_statuses(); 829 purple_accounts_restore_current_statuses();
829 } 830 }
830 831
831 if ((accounts = purple_accounts_get_all_active()) == NULL) 832 if ((active_accounts = purple_accounts_get_all_active()) == NULL)
832 { 833 {
833 pidgin_accounts_window_show(); 834 pidgin_accounts_window_show();
834 } 835 }
835 else 836 else
836 { 837 {
837 g_list_free(accounts); 838 g_list_free(active_accounts);
838 } 839 }
839 840
840 #ifdef HAVE_STARTUP_NOTIFICATION 841 #ifdef HAVE_STARTUP_NOTIFICATION
841 startup_notification_complete(); 842 startup_notification_complete();
842 #endif 843 #endif