pidgin: 3082d15c: Fix the breakage with account aliases th...

[rekkanoryo at pidgin.im]

-----------------------------------------------------------------
Revision: 3082d15caca08e3411fb7cd5e58d6af62811d9e6
Ancestor: f8d85e2fccdd5166da0ce2d35db65d64a19d0256
Author: rekkanoryo at pidgin.im
Date: 2008-05-04T00:51:46
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/3082d15caca08e3411fb7cd5e58d6af62811d9e6

Modified files:
        pidgin/gtkaccount.c

ChangeLog: 

Fix the breakage with account aliases that I introduced when I moved the
field.  Aliases shouldn't be lost when modifying the account now.

-------------- next part --------------
============================================================
--- pidgin/gtkaccount.c	43cbebebe76dddfb4e19f9dda674dfbda4e8aec3
+++ pidgin/gtkaccount.c	94b989824e5c89ebf52dd3659c67dfbc5f021b44
@@ -511,10 +511,6 @@ add_login_options(AccountPrefsDialog *di
 			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 @@ add_user_options(AccountPrefsDialog *dia
 		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));