cpw.qulogic.gtk3: 28dd6de0: Replace Facebook's UI hack for default c...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 28dd6de090914ddbb9f9f53c9fcedac5d254a538
Parent:   ec00853efcabfa1d48bd71b861d7a5ebc5adbb05
Author:   qulogic at pidgin.im
Date:     12/28/11 20:58:43
Branch:   im.pidgin.cpw.qulogic.gtk3
URL: http://d.pidgin.im/viewmtn/revision/info/28dd6de090914ddbb9f9f53c9fcedac5d254a538

Changelog: 

Replace Facebook's UI hack for default connection security.

Changes against parent ec00853efcabfa1d48bd71b861d7a5ebc5adbb05

  patched  libpurple/protocols/jabber/libfacebook.c
  patched  pidgin/gtkaccount.c

-------------- next part --------------
============================================================
--- pidgin/gtkaccount.c	aa9bfeb4ff01fa2bf1039c81df07915799be7b97
+++ pidgin/gtkaccount.c	6316f11cb7369be3bfde39ed5487553c580052ac
@@ -755,7 +755,7 @@ add_protocol_options(AccountPrefsDialog 
 {
 	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 
 			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 
 				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) {
============================================================
--- libpurple/protocols/jabber/libfacebook.c	a84c7bcfc1bbf999e67541028e5fc3994522abe8
+++ libpurple/protocols/jabber/libfacebook.c	58efa2f33dea883ce8bd8e25c0d54bf163c2d6aa
@@ -275,8 +275,8 @@ init_plugin(PurplePlugin *plugin)
 	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");