comparison: pidgin/gtkaccount.c
pidgin/gtkaccount.c
- changeset 31217
- d9b13102a21c
- parent 30874
- f04d2d1937e6
- child 31294
- 73607ab89c6f
equal
deleted
inserted
replaced
| 31216:8c392eb25b36 | 31217:d9b13102a21c |
|---|---|
| 557 value = purple_account_user_split_get_default_value(split); | 557 value = purple_account_user_split_get_default_value(split); |
| 558 | 558 |
| 559 /* Google Talk default domain hackery! */ | 559 /* Google Talk default domain hackery! */ |
| 560 menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(dialog->protocol_menu)); | 560 menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(dialog->protocol_menu)); |
| 561 item = gtk_menu_get_active(GTK_MENU(menu)); | 561 item = gtk_menu_get_active(GTK_MENU(menu)); |
| 562 if (value == NULL && g_object_get_data(G_OBJECT(item), "fake") && | 562 if (value == NULL && g_object_get_data(G_OBJECT(item), "fakegoogle") && |
| 563 !strcmp(purple_account_user_split_get_text(split), _("Domain"))) | 563 !strcmp(purple_account_user_split_get_text(split), _("Domain"))) |
| 564 value = "gmail.com"; | 564 value = "gmail.com"; |
| 565 | |
| 566 if (value == NULL && g_object_get_data(G_OBJECT(item), "fakefacebook") && | |
| 567 !strcmp(purple_account_user_split_get_text(split), _("Domain"))) | |
| 568 value = "chat.facebook.com"; | |
| 565 | 569 |
| 566 if (value != NULL) | 570 if (value != NULL) |
| 567 gtk_entry_set_text(GTK_ENTRY(entry), value); | 571 gtk_entry_set_text(GTK_ENTRY(entry), value); |
| 568 } | 572 } |
| 569 | 573 |
| 756 static void | 760 static void |
| 757 add_protocol_options(AccountPrefsDialog *dialog) | 761 add_protocol_options(AccountPrefsDialog *dialog) |
| 758 { | 762 { |
| 759 PurpleAccountOption *option; | 763 PurpleAccountOption *option; |
| 760 PurpleAccount *account; | 764 PurpleAccount *account; |
| 761 GtkWidget *vbox, *check, *entry, *combo; | 765 GtkWidget *vbox, *check, *entry, *combo, *menu, *item; |
| 762 GList *list, *node; | 766 GList *list, *node; |
| 763 gint i, idx, int_value; | 767 gint i, idx, int_value; |
| 764 GtkListStore *model; | 768 GtkListStore *model; |
| 765 GtkTreeIter iter; | 769 GtkTreeIter iter; |
| 766 GtkCellRenderer *renderer; | 770 GtkCellRenderer *renderer; |
| 794 dialog->protocol_frame = vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); | 798 dialog->protocol_frame = vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); |
| 795 gtk_container_set_border_width(GTK_CONTAINER(vbox), PIDGIN_HIG_BORDER); | 799 gtk_container_set_border_width(GTK_CONTAINER(vbox), PIDGIN_HIG_BORDER); |
| 796 gtk_notebook_insert_page(GTK_NOTEBOOK(dialog->notebook), vbox, | 800 gtk_notebook_insert_page(GTK_NOTEBOOK(dialog->notebook), vbox, |
| 797 gtk_label_new_with_mnemonic(_("Ad_vanced")), 1); | 801 gtk_label_new_with_mnemonic(_("Ad_vanced")), 1); |
| 798 gtk_widget_show(vbox); | 802 gtk_widget_show(vbox); |
| 803 | |
| 804 menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(dialog->protocol_menu)); | |
| 805 item = gtk_menu_get_active(GTK_MENU(menu)); | |
| 799 | 806 |
| 800 for (l = dialog->prpl_info->protocol_options; l != NULL; l = l->next) | 807 for (l = dialog->prpl_info->protocol_options; l != NULL; l = l->next) |
| 801 { | 808 { |
| 802 option = (PurpleAccountOption *)l->data; | 809 option = (PurpleAccountOption *)l->data; |
| 803 | 810 |
| 908 } | 915 } |
| 909 | 916 |
| 910 list = purple_account_option_get_list(option); | 917 list = purple_account_option_get_list(option); |
| 911 model = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_POINTER); | 918 model = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_POINTER); |
| 912 opt_entry->widget = combo = gtk_combo_box_new_with_model(GTK_TREE_MODEL(model)); | 919 opt_entry->widget = combo = gtk_combo_box_new_with_model(GTK_TREE_MODEL(model)); |
| 920 | |
| 921 if (g_object_get_data(G_OBJECT(item), "fakefacebook") && | |
| 922 !strcmp(opt_entry->setting, "connection_security")) | |
| 923 str_value = "opportunistic_tls"; | |
| 913 | 924 |
| 914 /* Loop through list of PurpleKeyValuePair items */ | 925 /* Loop through list of PurpleKeyValuePair items */ |
| 915 for (node = list; node != NULL; node = node->next) { | 926 for (node = list; node != NULL; node = node->next) { |
| 916 if (node->data != NULL) { | 927 if (node->data != NULL) { |
| 917 kvp = (PurpleKeyValuePair *) node->data; | 928 kvp = (PurpleKeyValuePair *) node->data; |
