# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 991431188 0
# Node ID c9db54d8d8dc3cb46a3d5bf6677bd682551dfe3a
# Parent  6a9109c790340090c7d8c2fbe25ffaa7de25bb22
[gaim-migrate @ 1948]
uh

committer: Tailor Script <tailor@pidgin.im>

diff -r 6a9109c79034 -r c9db54d8d8dc src/gaimrc.c
--- a/src/gaimrc.c	Fri Jun 01 21:27:59 2001 +0000
+++ b/src/gaimrc.c	Fri Jun 01 21:33:08 2001 +0000
@@ -803,21 +803,29 @@
 	if (!proxyhost[0]) {
 		if (g_getenv("HTTP_PROXY"))
 			g_snprintf(proxyhost, sizeof(proxyhost), "%s", g_getenv("HTTP_PROXY"));
+		else if (g_getenv("http_proxy"))
+			g_snprintf(proxyhost, sizeof(proxyhost), "%s", g_getenv("http_proxy"));
 		else if (g_getenv("HTTPPROXY"))
 			g_snprintf(proxyhost, sizeof(proxyhost), "%s", g_getenv("HTTPPROXY"));
 
 		if (g_getenv("HTTP_PROXY_PORT"))
 			proxyport = atoi(g_getenv("HTTP_PROXY_PORT"));
+		else if (g_getenv("http_proxy_port"))
+			proxyport = atoi(g_getenv("http_proxy_port"));
 		else if (g_getenv("HTTPPROXYPORT"))
 			proxyport = atoi(g_getenv("HTTPPROXYPORT"));
 
 		if (g_getenv("HTTP_PROXY_USER"))
 			g_snprintf(proxyuser, sizeof(proxyuser), "%s", g_getenv("HTTP_PROXY_USER"));
+		else if (g_getenv("http_proxy_user"))
+			g_snprintf(proxyuser, sizeof(proxyuser), "%s", g_getenv("http_proxy_user"));
 		else if (g_getenv("HTTPPROXYUSER"))
 			g_snprintf(proxyuser, sizeof(proxyuser), "%s", g_getenv("HTTPPROXYUSER"));
 
 		if (g_getenv("HTTP_PROXY_PASS"))
 			g_snprintf(proxypass, sizeof(proxypass), "%s", g_getenv("HTTP_PROXY_PASS"));
+		else if (g_getenv("http_proxy_pass"))
+			g_snprintf(proxypass, sizeof(proxypass), "%s", g_getenv("http_proxy_pass"));
 		else if (g_getenv("HTTPPROXYPASS"))
 			g_snprintf(proxypass, sizeof(proxypass), "%s", g_getenv("HTTPPROXYPASS"));
 
diff -r 6a9109c79034 -r c9db54d8d8dc src/server.c
--- a/src/server.c	Fri Jun 01 21:27:59 2001 +0000
+++ b/src/server.c	Fri Jun 01 21:33:08 2001 +0000
@@ -163,30 +163,24 @@
 
 void serv_set_away(struct gaim_connection *gc, char *state, char *message)
 {
-	if (gc && gc->prpl && gc->prpl->set_away) 
-	{
+	if (gc && gc->prpl && gc->prpl->set_away) {
 		char *buf=NULL;
-		if(message) 
-		{
-		buf = g_malloc(strlen(message)+1);
-		if(gc->prpl->options & OPT_PROTO_HTML) 
-		{
-			strncpy(buf, message, strlen(message)+1);
-		} 
-		else 
-		{
-			strncpy_nohtml(buf, message, strlen(message)+1);
+		if(message) {
+			buf = g_malloc(strlen(message)+1);
+			if(gc->prpl->options & OPT_PROTO_HTML)
+				strncpy(buf, message, strlen(message)+1);
+			else
+				strncpy_nohtml(buf, message, strlen(message)+1);
 		}
+
+		(*gc->prpl->set_away)(gc, state, buf);
+		plugin_event(event_away, gc, state, buf, 0);
+
+		if(buf)
+			g_free(buf);
 	}
 
-	(*gc->prpl->set_away)(gc, state, buf);
-	plugin_event(event_away, gc, state, buf, 0);
-
-	if(buf)
-		g_free(buf);
-}
-
-system_log(log_away, gc, NULL, OPT_LOG_BUDDY_AWAY | OPT_LOG_MY_SIGNON);
+	system_log(log_away, gc, NULL, OPT_LOG_BUDDY_AWAY | OPT_LOG_MY_SIGNON);
 }
 
 void serv_set_away_all(char *message)