comparison: pidgin/pidginaccounteditor.c
pidgin/pidginaccounteditor.c
- changeset 41971
- b03ca9889e90
- parent 41962
- f802660eaef2
- child 42151
- 41b9c5be8965
equal
deleted
inserted
replaced
| 41970:454caa755f53 | 41971:b03ca9889e90 |
|---|---|
| 226 | 226 |
| 227 gtk_widget_set_visible(editor->avatar_row, show_avatar_opts); | 227 gtk_widget_set_visible(editor->avatar_row, show_avatar_opts); |
| 228 | 228 |
| 229 /* Determine our values. */ | 229 /* Determine our values. */ |
| 230 if(editor->account != NULL) { | 230 if(editor->account != NULL) { |
| 231 svalue = purple_account_get_private_alias(editor->account); | 231 PurpleContactInfo *info = PURPLE_CONTACT_INFO(editor->account); |
| 232 | |
| 233 svalue = purple_contact_info_get_alias(info); | |
| 232 image = purple_buddy_icons_find_account_icon(editor->account); | 234 image = purple_buddy_icons_find_account_icon(editor->account); |
| 233 use_global = purple_account_get_bool(editor->account, | 235 use_global = purple_account_get_bool(editor->account, |
| 234 "use-global-buddyicon", TRUE); | 236 "use-global-buddyicon", TRUE); |
| 235 } | 237 } |
| 236 | 238 |
| 779 return new_account; | 781 return new_account; |
| 780 } | 782 } |
| 781 | 783 |
| 782 static void | 784 static void |
| 783 pidgin_account_editor_save_user_options(PidginAccountEditor *editor) { | 785 pidgin_account_editor_save_user_options(PidginAccountEditor *editor) { |
| 786 PurpleContactInfo *info = PURPLE_CONTACT_INFO(editor->account); | |
| 784 const gchar *svalue = NULL; | 787 const gchar *svalue = NULL; |
| 785 gboolean bvalue = FALSE; | 788 gboolean bvalue = FALSE; |
| 786 | 789 |
| 787 purple_account_freeze_notify_settings(editor->account); | 790 purple_account_freeze_notify_settings(editor->account); |
| 788 | 791 |
| 789 /* Set the alias. */ | 792 /* Set the alias. */ |
| 790 svalue = gtk_editable_get_text(GTK_EDITABLE(editor->alias)); | 793 svalue = gtk_editable_get_text(GTK_EDITABLE(editor->alias)); |
| 791 if(*svalue == '\0') { | 794 if(*svalue == '\0') { |
| 792 svalue = NULL; | 795 svalue = NULL; |
| 793 } | 796 } |
| 794 purple_account_set_private_alias(editor->account, svalue); | 797 purple_contact_info_set_alias(info, svalue); |
| 795 | 798 |
| 796 /* Set whether or not to use the global avatar. */ | 799 /* Set whether or not to use the global avatar. */ |
| 797 bvalue = gtk_switch_get_active(GTK_SWITCH(editor->use_custom_avatar)); | 800 bvalue = gtk_switch_get_active(GTK_SWITCH(editor->use_custom_avatar)); |
| 798 purple_account_set_bool(editor->account, "use-global-buddyicon", !bvalue); | 801 purple_account_set_bool(editor->account, "use-global-buddyicon", !bvalue); |
| 799 | 802 |
