comparison: pidgin/gtkaccount.c
pidgin/gtkaccount.c
- branch
- cpw.darkrain42.xmpp.avatars
- changeset 25542
- eb604c9feee9
- parent 25529
- 6e7e5c40d3a9
- child 25730
- c2698534cbb1
- child 25911
- f22097dc8413
equal
deleted
inserted
replaced
| 25481:46c34a4f99df | 25542:eb604c9feee9 |
|---|---|
| 553 | 553 |
| 554 | 554 |
| 555 /* Password */ | 555 /* Password */ |
| 556 dialog->password_entry = gtk_entry_new(); | 556 dialog->password_entry = gtk_entry_new(); |
| 557 gtk_entry_set_visibility(GTK_ENTRY(dialog->password_entry), FALSE); | 557 gtk_entry_set_visibility(GTK_ENTRY(dialog->password_entry), FALSE); |
| 558 #if !GTK_CHECK_VERSION(2,16,0) | |
| 558 if (gtk_entry_get_invisible_char(GTK_ENTRY(dialog->password_entry)) == '*') | 559 if (gtk_entry_get_invisible_char(GTK_ENTRY(dialog->password_entry)) == '*') |
| 559 gtk_entry_set_invisible_char(GTK_ENTRY(dialog->password_entry), PIDGIN_INVISIBLE_CHAR); | 560 gtk_entry_set_invisible_char(GTK_ENTRY(dialog->password_entry), PIDGIN_INVISIBLE_CHAR); |
| 561 #endif /* Less than GTK+ 2.16 */ | |
| 560 dialog->password_box = add_pref_box(dialog, vbox, _("_Password:"), | 562 dialog->password_box = add_pref_box(dialog, vbox, _("_Password:"), |
| 561 dialog->password_entry); | 563 dialog->password_entry); |
| 562 | 564 |
| 563 /* Remember Password */ | 565 /* Remember Password */ |
| 564 dialog->remember_pass_check = | 566 dialog->remember_pass_check = |
| 858 | 860 |
| 859 opt_entry->widget = entry = gtk_entry_new(); | 861 opt_entry->widget = entry = gtk_entry_new(); |
| 860 if (purple_account_option_get_masked(option)) | 862 if (purple_account_option_get_masked(option)) |
| 861 { | 863 { |
| 862 gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE); | 864 gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE); |
| 865 #if !GTK_CHECK_VERSION(2,16,0) | |
| 863 if (gtk_entry_get_invisible_char(GTK_ENTRY(entry)) == '*') | 866 if (gtk_entry_get_invisible_char(GTK_ENTRY(entry)) == '*') |
| 864 gtk_entry_set_invisible_char(GTK_ENTRY(entry), PIDGIN_INVISIBLE_CHAR); | 867 gtk_entry_set_invisible_char(GTK_ENTRY(entry), PIDGIN_INVISIBLE_CHAR); |
| 868 #endif /* Less than GTK+ 2.16 */ | |
| 865 } | 869 } |
| 866 | 870 |
| 867 if (str_value != NULL) | 871 if (str_value != NULL) |
| 868 gtk_entry_set_text(GTK_ENTRY(entry), str_value); | 872 gtk_entry_set_text(GTK_ENTRY(entry), str_value); |
| 869 | 873 |
| 1087 add_pref_box(dialog, vbox2, _("_Username:"), dialog->proxy_user_entry); | 1091 add_pref_box(dialog, vbox2, _("_Username:"), dialog->proxy_user_entry); |
| 1088 | 1092 |
| 1089 /* Password */ | 1093 /* Password */ |
| 1090 dialog->proxy_pass_entry = gtk_entry_new(); | 1094 dialog->proxy_pass_entry = gtk_entry_new(); |
| 1091 gtk_entry_set_visibility(GTK_ENTRY(dialog->proxy_pass_entry), FALSE); | 1095 gtk_entry_set_visibility(GTK_ENTRY(dialog->proxy_pass_entry), FALSE); |
| 1096 #if !GTK_CHECK_VERSION(2,16,0) | |
| 1092 if (gtk_entry_get_invisible_char(GTK_ENTRY(dialog->proxy_pass_entry)) == '*') | 1097 if (gtk_entry_get_invisible_char(GTK_ENTRY(dialog->proxy_pass_entry)) == '*') |
| 1093 gtk_entry_set_invisible_char(GTK_ENTRY(dialog->proxy_pass_entry), PIDGIN_INVISIBLE_CHAR); | 1098 gtk_entry_set_invisible_char(GTK_ENTRY(dialog->proxy_pass_entry), PIDGIN_INVISIBLE_CHAR); |
| 1099 #endif /* Less than GTK+ 2.16 */ | |
| 1094 add_pref_box(dialog, vbox2, _("Pa_ssword:"), dialog->proxy_pass_entry); | 1100 add_pref_box(dialog, vbox2, _("Pa_ssword:"), dialog->proxy_pass_entry); |
| 1095 | 1101 |
| 1096 if (dialog->account != NULL && | 1102 if (dialog->account != NULL && |
| 1097 (proxy_info = purple_account_get_proxy_info(dialog->account)) != NULL) { | 1103 (proxy_info = purple_account_get_proxy_info(dialog->account)) != NULL) { |
| 1098 | 1104 |
| 1982 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl); | 1988 prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl); |
| 1983 if (prpl_info != NULL && prpl_info->icon_spec.format != NULL) { | 1989 if (prpl_info != NULL && prpl_info->icon_spec.format != NULL) { |
| 1984 if (purple_account_get_bool(account, "use-global-buddyicon", TRUE)) { | 1990 if (purple_account_get_bool(account, "use-global-buddyicon", TRUE)) { |
| 1985 if (global_buddyicon != NULL) | 1991 if (global_buddyicon != NULL) |
| 1986 buddyicon = g_object_ref(G_OBJECT(global_buddyicon)); | 1992 buddyicon = g_object_ref(G_OBJECT(global_buddyicon)); |
| 1987 /* This is for when set_account() is called for a single account */ | 1993 else { |
| 1988 else | 1994 /* This is for when set_account() is called for a single account */ |
| 1989 img = purple_buddy_icons_find_account_icon(account); | 1995 const char *path; |
| 1996 path = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/accounts/buddyicon"); | |
| 1997 if (path != NULL) | |
| 1998 img = purple_imgstore_new_from_file(path); | |
| 1999 } | |
| 1990 } else { | 2000 } else { |
| 1991 img = purple_buddy_icons_find_account_icon(account); | 2001 img = purple_buddy_icons_find_account_icon(account); |
| 1992 } | 2002 } |
| 1993 } | 2003 } |
| 1994 | 2004 |
