diff options
| author | Elliott Sales de Andrade <qulogic@pidgin.im> | 2011-12-29 01:58:43 +0000 |
|---|---|---|
| committer | Elliott Sales de Andrade <qulogic@pidgin.im> | 2011-12-29 01:58:43 +0000 |
| commit | 123a676b4cf5ea0f635d8e1bacc9e47058d56f34 (patch) | |
| tree | a812c0abe3b49f805b16251746e11b041921d0ec | |
| parent | b8432dc9481abb6a8e52461ba22247da1ad9b296 (diff) | |
| download | pidgin-123a676b4cf5ea0f635d8e1bacc9e47058d56f34.tar.gz | |
Replace Facebook's UI hack for default connection security.
| -rw-r--r-- | libpurple/protocols/jabber/libfacebook.c | 2 | ||||
| -rw-r--r-- | pidgin/gtkaccount.c | 15 |
2 files changed, 2 insertions, 15 deletions
diff --git a/libpurple/protocols/jabber/libfacebook.c b/libpurple/protocols/jabber/libfacebook.c index abf231711c..9da4e0162b 100644 --- a/libpurple/protocols/jabber/libfacebook.c +++ b/libpurple/protocols/jabber/libfacebook.c @@ -275,8 +275,8 @@ init_plugin(PurplePlugin *plugin) list = g_list_prepend(list, kvp); \ } - ADD_VALUE(encryption_values, _("Require encryption"), "require_tls"); ADD_VALUE(encryption_values, _("Use encryption if available"), "opportunistic_tls"); + ADD_VALUE(encryption_values, _("Require encryption"), "require_tls"); ADD_VALUE(encryption_values, _("Use old-style SSL"), "old_ssl"); #if 0 ADD_VALUE(encryption_values, "None", "none"); diff --git a/pidgin/gtkaccount.c b/pidgin/gtkaccount.c index 99e1e853b5..a3d1062598 100644 --- a/pidgin/gtkaccount.c +++ b/pidgin/gtkaccount.c @@ -755,7 +755,7 @@ add_protocol_options(AccountPrefsDialog *dialog) { PurpleAccountOption *option; PurpleAccount *account; - GtkWidget *vbox, *check, *entry, *combo, *menu, *item; + GtkWidget *vbox, *check, *entry, *combo; GList *list, *node; gint i, idx, int_value; GtkListStore *model; @@ -794,12 +794,6 @@ add_protocol_options(AccountPrefsDialog *dialog) gtk_label_new_with_mnemonic(_("Ad_vanced")), 1); gtk_widget_show(vbox); -/* FIXME: Facebook forced-options hack */ -#if 0 - menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(dialog->protocol_menu)); - item = gtk_menu_get_active(GTK_MENU(menu)); -#endif - for (l = dialog->prpl_info->protocol_options; l != NULL; l = l->next) { option = (PurpleAccountOption *)l->data; @@ -914,13 +908,6 @@ add_protocol_options(AccountPrefsDialog *dialog) model = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_POINTER); opt_entry->widget = combo = gtk_combo_box_new_with_model(GTK_TREE_MODEL(model)); -/* FIXME: Facebook forced-options hack */ -#if 0 - if (g_object_get_data(G_OBJECT(item), "fakefacebook") && - !strcmp(opt_entry->setting, "connection_security")) - str_value = "opportunistic_tls"; -#endif - /* Loop through list of PurpleKeyValuePair items */ for (node = list; node != NULL; node = node->next) { if (node->data != NULL) { |