Mercurial > pidgin.yaz
comparison src/gtkaccount.c @ 11985:41d84ac57cb6
[gaim-migrate @ 14278]
Getting some stuff out of my tree
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Sat, 05 Nov 2005 21:49:44 +0000 |
parents | 1c53ff1e7a0d |
children | bfbb1798535e |
comparison
equal
deleted
inserted
replaced
11984:59494e5f7fdf | 11985:41d84ac57cb6 |
---|---|
1466 GTK_TOGGLE_BUTTON(dialog->new_mail_check))); | 1466 GTK_TOGGLE_BUTTON(dialog->new_mail_check))); |
1467 | 1467 |
1468 /* Password */ | 1468 /* Password */ |
1469 value = gtk_entry_get_text(GTK_ENTRY(dialog->password_entry)); | 1469 value = gtk_entry_get_text(GTK_ENTRY(dialog->password_entry)); |
1470 | 1470 |
1471 if (gaim_account_get_remember_password(account) && *value != '\0') | 1471 /* |
1472 * We set the password if this is a new account because new accounts | |
1473 * will be set to online, and if the user has entered a password into | |
1474 * the account editor (but has not checked the 'save' box), then we | |
1475 * don't want to prompt them. | |
1476 */ | |
1477 if ((gaim_account_get_remember_password(account) || new) && (*value != '\0')) | |
1472 gaim_account_set_password(account, value); | 1478 gaim_account_set_password(account, value); |
1473 else | 1479 else |
1474 gaim_account_set_password(account, NULL); | 1480 gaim_account_set_password(account, NULL); |
1475 | 1481 |
1476 /* Build the username string. */ | 1482 /* Build the username string. */ |
1602 if (new) | 1608 if (new) |
1603 gaim_accounts_add(account); | 1609 gaim_accounts_add(account); |
1604 else | 1610 else |
1605 gaim_signal_emit(gaim_gtk_account_get_handle(), "account-modified", account); | 1611 gaim_signal_emit(gaim_gtk_account_get_handle(), "account-modified", account); |
1606 | 1612 |
1607 /* TODO: This doesn't work quite right yet. */ | |
1608 if (new) { | 1613 if (new) { |
1609 const char *current_savedstatus_name; | 1614 const char *current_savedstatus_name; |
1610 const GaimSavedStatus *saved_status; | 1615 const GaimSavedStatus *saved_status; |
1611 | 1616 |
1612 current_savedstatus_name = gaim_prefs_get_string("/core/status/current"); | 1617 current_savedstatus_name = gaim_prefs_get_string("/core/status/current"); |
1613 saved_status = gaim_savedstatus_find(current_savedstatus_name); | 1618 saved_status = gaim_savedstatus_find(current_savedstatus_name); |
1614 gaim_savedstatus_activate_for_account(saved_status, account); | 1619 gaim_savedstatus_activate_for_account(saved_status, account); |
1615 | |
1616 /* | |
1617 This is the old way. The new way is an improvement. | |
1618 GaimGtkBuddyList *gtkblist; | |
1619 GtkGaimStatusBox *status_box; | |
1620 char *status_type_id; | |
1621 | |
1622 gtkblist = GAIM_GTK_BLIST(gaim_get_blist()); | |
1623 status_box = GTK_GAIM_STATUS_BOX(gtkblist->statusbox); | |
1624 | |
1625 status_type_id = gtk_gaim_status_box_get_active_type(status_box); | |
1626 gaim_presence_set_status_active(account->presence, status_type_id, TRUE); | |
1627 g_free(status_type_id); | |
1628 */ | |
1629 } | 1620 } |
1630 | 1621 |
1631 return account; | 1622 return account; |
1632 } | 1623 } |
1633 | 1624 |