# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1063679992 0
# Node ID a14200b24371fdc5308caee079ec76bbbc2f6abb
# Parent  4146b836ba0a9f6dbdaf4701daa489e31f3a870e
[gaim-migrate @ 7401]
This fixes bug 803017: Use global proxy setting not saved
http://sourceforge.net/tracker/?func=detail&aid=803017&group_id=235&atid=100235

The problem was basically a lack of variable initialization.  Proxy
settings are confusing.  Like some girls I know.

committer: Tailor Script <tailor@pidgin.im>

diff -r 4146b836ba0a -r a14200b24371 src/gtkaccount.c
--- a/src/gtkaccount.c	Tue Sep 16 02:20:49 2003 +0000
+++ b/src/gtkaccount.c	Tue Sep 16 02:39:52 2003 +0000
@@ -893,8 +893,12 @@
 				gtk_entry_set_text(GTK_ENTRY(dialog->proxy_pass_entry), value);
 		}
 	}
-	else
+	else {
+		dialog->new_proxy_type = GAIM_PROXY_USE_GLOBAL;
+		gtk_option_menu_set_history(GTK_OPTION_MENU(dialog->proxy_dropdown),
+									dialog->new_proxy_type + 1);
 		gtk_widget_hide_all(vbox2);
+	}
 
 	/* Connect signals. */
 	g_signal_connect(G_OBJECT(dialog->proxy_dropdown), "changed",
diff -r 4146b836ba0a -r a14200b24371 src/proxy.c
--- a/src/proxy.c	Tue Sep 16 02:20:49 2003 +0000
+++ b/src/proxy.c	Tue Sep 16 02:39:52 2003 +0000
@@ -25,7 +25,8 @@
 
 /* this is a little piece of code to handle proxy connection */
 /* it is intended to : 1st handle http proxy, using the CONNECT command
- , 2nd provide an easy way to add socks support */
+ , 2nd provide an easy way to add socks support
+ , 3rd draw women to it like flies to honey */
 
 #include "internal.h"
 #include "debug.h"