# HG changeset patch # User Daniel Atallah # Date 1304363332 0 # Node ID adb809e5e7d40eb29fdc09cd755452ec55b9ffd6 # Parent 5dd34261a607914df9420a0fad2ff60ba6b210d1 Fix account-specific proxy config GUI to use same ordering as global proxy GUI. Refs #11110 diff -r 5dd34261a607 -r adb809e5e7d4 pidgin/gtkaccount.c --- a/pidgin/gtkaccount.c Mon May 02 19:06:45 2011 +0000 +++ b/pidgin/gtkaccount.c Mon May 02 19:08:52 2011 +0000 @@ -1003,12 +1003,6 @@ gtk_list_store_append(model, &iter); gtk_list_store_set(model, &iter, - 0, _("HTTP"), - 1, PURPLE_PROXY_HTTP, - -1); - - gtk_list_store_append(model, &iter); - gtk_list_store_set(model, &iter, 0, _("SOCKS 4"), 1, PURPLE_PROXY_SOCKS4, -1); @@ -1027,6 +1021,12 @@ gtk_list_store_append(model, &iter); gtk_list_store_set(model, &iter, + 0, _("HTTP"), + 1, PURPLE_PROXY_HTTP, + -1); + + gtk_list_store_append(model, &iter); + gtk_list_store_set(model, &iter, 0, _("Use Environmental Settings"), 1, PURPLE_PROXY_USE_ENVVAR, -1);