Mercurial > pidgin.yaz
comparison src/gtkaccount.c @ 11987:831e52ceddf3
[gaim-migrate @ 14280]
When adding a new account, don't attempt to sign on before we
set the password on the account.
I don't know if I'll get a chance to fix oscar sign-on-as-away tonight.
I'm not sure when I broke that.
I'm not sure Gaim is quite in a state to release tomorrow...
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Sun, 06 Nov 2005 01:08:56 +0000 |
parents | bfbb1798535e |
children | e4666705944b |
comparison
equal
deleted
inserted
replaced
11986:bfbb1798535e | 11987:831e52ceddf3 |
---|---|
1435 { | 1435 { |
1436 const char *screenname; | 1436 const char *screenname; |
1437 | 1437 |
1438 screenname = gtk_entry_get_text(GTK_ENTRY(dialog->screenname_entry)); | 1438 screenname = gtk_entry_get_text(GTK_ENTRY(dialog->screenname_entry)); |
1439 account = gaim_account_new(screenname, dialog->protocol_id); | 1439 account = gaim_account_new(screenname, dialog->protocol_id); |
1440 gaim_account_set_enabled(account, GAIM_GTK_UI, TRUE); | |
1441 new = TRUE; | 1440 new = TRUE; |
1442 } | 1441 } |
1443 else | 1442 else |
1444 { | 1443 { |
1445 account = dialog->account; | 1444 account = dialog->account; |
1613 if (new) | 1612 if (new) |
1614 gaim_accounts_add(account); | 1613 gaim_accounts_add(account); |
1615 else | 1614 else |
1616 gaim_signal_emit(gaim_gtk_account_get_handle(), "account-modified", account); | 1615 gaim_signal_emit(gaim_gtk_account_get_handle(), "account-modified", account); |
1617 | 1616 |
1617 /* If this is a new account, then sign on! */ | |
1618 if (new) { | 1618 if (new) { |
1619 const char *current_savedstatus_name; | 1619 const char *current_savedstatus_name; |
1620 const GaimSavedStatus *saved_status; | 1620 const GaimSavedStatus *saved_status; |
1621 | 1621 |
1622 gaim_account_set_enabled(account, GAIM_GTK_UI, TRUE); | |
1622 current_savedstatus_name = gaim_prefs_get_string("/core/status/current"); | 1623 current_savedstatus_name = gaim_prefs_get_string("/core/status/current"); |
1623 saved_status = gaim_savedstatus_find(current_savedstatus_name); | 1624 saved_status = gaim_savedstatus_find(current_savedstatus_name); |
1624 gaim_savedstatus_activate_for_account(saved_status, account); | 1625 gaim_savedstatus_activate_for_account(saved_status, account); |
1625 } | 1626 } |
1626 | 1627 |