# HG changeset patch # User John Bailey # Date 1209862306 0 # Node ID 7492fdcdbcea0e4d79bb759ea08fd7b645765550 # Parent f62a4a7fe365baae600c08705eae0991e4526193 Fix the breakage with account aliases that I introduced when I moved the field. Aliases shouldn't be lost when modifying the account now. diff -r f62a4a7fe365 -r 7492fdcdbcea pidgin/gtkaccount.c --- a/pidgin/gtkaccount.c Sat May 03 23:51:43 2008 +0000 +++ b/pidgin/gtkaccount.c Sun May 04 00:51:46 2008 +0000 @@ -511,10 +511,6 @@ gtk_entry_set_text(GTK_ENTRY(dialog->password_entry), purple_account_get_password(dialog->account)); - if (purple_account_get_alias(dialog->account)) - gtk_entry_set_text(GTK_ENTRY(dialog->alias_entry), - purple_account_get_alias(dialog->account)); - gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(dialog->remember_pass_check), purple_account_get_remember_password(dialog->account)); @@ -635,6 +631,10 @@ gpointer data = NULL; size_t len = 0; + if (purple_account_get_alias(dialog->account)) + gtk_entry_set_text(GTK_ENTRY(dialog->alias_entry), + purple_account_get_alias(dialog->account)); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dialog->new_mail_check), purple_account_get_check_mail(dialog->account));