# HG changeset patch
# User John Bailey <rekkanoryo@rekkanoryo.org>
# Date 1276473955 0
# Node ID 984217629ec9f5a1f8e3f811ce114832dba1ec02
# Parent  e9001aa49be86aa8c5b2e3b19937df4a8eebe548
Make HTTP proxy detection in the yahoo prpls a bit more robust.  This should
solve some weird proxy related items I couldn't figure out before.  Refs #11986.

diff -r e9001aa49be8 -r 984217629ec9 libpurple/protocols/yahoo/util.c
--- a/libpurple/protocols/yahoo/util.c	Sun Jun 13 23:07:24 2010 +0000
+++ b/libpurple/protocols/yahoo/util.c	Mon Jun 14 00:05:55 2010 +0000
@@ -33,10 +33,21 @@
 #include <string.h>
 
 gboolean
-yahoo_account_use_http_proxy(PurpleConnection *conn)
+yahoo_account_use_http_proxy(PurpleConnection *pc)
 {
-	PurpleProxyInfo *ppi = purple_proxy_get_setup(conn->account);
-	return (ppi->type == PURPLE_PROXY_HTTP || ppi->type == PURPLE_PROXY_USE_ENVVAR);
+	PurpleAccount *account = purple_connection_get_account(pc);
+	PurpleProxyInfo *ppi = NULL;
+	PurpleProxyType type = PURPLE_PROXY_NONE;
+	gboolean proxy_ssl = purple_account_get_bool(account, "proxy_ssl", FALSE);
+	
+	if(proxy_ssl)
+		ppi = purple_proxy_get_setup(account);
+	else
+		ppi = purple_global_proxy_get_info();
+
+	type = purple_proxy_info_get_type(ppi);
+
+	return (type == PURPLE_PROXY_HTTP || type == PURPLE_PROXY_USE_ENVVAR);
 }
 
 /*