Mercurial > pidgin.yaz
comparison pidgin/gtkaccount.c @ 22809:7492fdcdbcea
Fix the breakage with account aliases that I introduced when I moved the
field. Aliases shouldn't be lost when modifying the account now.
author | John Bailey <rekkanoryo@rekkanoryo.org> |
---|---|
date | Sun, 04 May 2008 00:51:46 +0000 |
parents | cc8903c59d6b |
children | bce10d146dd4 8c3444f04709 ac567757d236 |
comparison
equal
deleted
inserted
replaced
22808:f62a4a7fe365 | 22809:7492fdcdbcea |
---|---|
509 if (dialog->account != NULL) { | 509 if (dialog->account != NULL) { |
510 if (purple_account_get_password(dialog->account)) | 510 if (purple_account_get_password(dialog->account)) |
511 gtk_entry_set_text(GTK_ENTRY(dialog->password_entry), | 511 gtk_entry_set_text(GTK_ENTRY(dialog->password_entry), |
512 purple_account_get_password(dialog->account)); | 512 purple_account_get_password(dialog->account)); |
513 | 513 |
514 if (purple_account_get_alias(dialog->account)) | |
515 gtk_entry_set_text(GTK_ENTRY(dialog->alias_entry), | |
516 purple_account_get_alias(dialog->account)); | |
517 | |
518 gtk_toggle_button_set_active( | 514 gtk_toggle_button_set_active( |
519 GTK_TOGGLE_BUTTON(dialog->remember_pass_check), | 515 GTK_TOGGLE_BUTTON(dialog->remember_pass_check), |
520 purple_account_get_remember_password(dialog->account)); | 516 purple_account_get_remember_password(dialog->account)); |
521 } | 517 } |
522 | 518 |
632 | 628 |
633 if (dialog->account != NULL) { | 629 if (dialog->account != NULL) { |
634 PurpleStoredImage *img; | 630 PurpleStoredImage *img; |
635 gpointer data = NULL; | 631 gpointer data = NULL; |
636 size_t len = 0; | 632 size_t len = 0; |
633 | |
634 if (purple_account_get_alias(dialog->account)) | |
635 gtk_entry_set_text(GTK_ENTRY(dialog->alias_entry), | |
636 purple_account_get_alias(dialog->account)); | |
637 | 637 |
638 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dialog->new_mail_check), | 638 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dialog->new_mail_check), |
639 purple_account_get_check_mail(dialog->account)); | 639 purple_account_get_check_mail(dialog->account)); |
640 | 640 |
641 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dialog->icon_check), | 641 gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dialog->icon_check), |