pidgin/pidgin

Replace Facebook's UI hack for default connection security.
cpw.qulogic.gtk3
2011-12-29, Elliott Sales de Andrade
0672f4626f75
Parents 5aaf2dd75f1c
Children 956eb215f6c6
Replace Facebook's UI hack for default connection security.
2 files changed, 2 insertions(+), 15 deletions(-)
  • +1 -1
    libpurple/protocols/jabber/libfacebook.c
  • +1 -14
    pidgin/gtkaccount.c
    • --- a/libpurple/protocols/jabber/libfacebook.c Thu Dec 29 01:49:46 2011 +0000
    +++ b/libpurple/protocols/jabber/libfacebook.c Thu Dec 29 01:58:43 2011 +0000
    @@ -275,8 +275,8 @@
    list = g_list_prepend(list, kvp); \
    }
    + ADD_VALUE(encryption_values, _("Use encryption if available"), "opportunistic_tls");
    ADD_VALUE(encryption_values, _("Require encryption"), "require_tls");
    - ADD_VALUE(encryption_values, _("Use encryption if available"), "opportunistic_tls");
    ADD_VALUE(encryption_values, _("Use old-style SSL"), "old_ssl");
    #if 0
    ADD_VALUE(encryption_values, "None", "none");
    --- a/pidgin/gtkaccount.c Thu Dec 29 01:49:46 2011 +0000
    +++ b/pidgin/gtkaccount.c Thu Dec 29 01:58:43 2011 +0000
    @@ -755,7 +755,7 @@
    {
    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 @@
    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 @@
    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) {