# HG changeset patch
# User Christian Hammond <chipx86@chipx86.com>
# Date 1083033721 0
# Node ID ffecda0c1f45e497b9f8a763bc2b3620b1b5a425
# Parent  f8038b1f7449870fc0a3d6c1f09dd7a9a2c91ebd
[gaim-migrate @ 9595]
Another patch by Daniel Atallah. The host and port for the MSN HTTP Method
were being excessively manually overwritten in several places during login,
so he removed the unnecessary ones. Thanks again.

committer: Tailor Script <tailor@pidgin.im>

diff -r f8038b1f7449 -r ffecda0c1f45 src/protocols/msn/servconn.c
--- a/src/protocols/msn/servconn.c	Tue Apr 27 02:33:29 2004 +0000
+++ b/src/protocols/msn/servconn.c	Tue Apr 27 02:42:01 2004 +0000
@@ -93,8 +93,6 @@
 	if (session->http_method)
 	{
 		servconn->http_data->gateway_ip = g_strdup(host);
-		host = "gateway.messenger.hotmail.com";
-		port = 80;
 	}
 
 	i = gaim_proxy_connect(session->account, host, port, connect_cb,
diff -r f8038b1f7449 -r ffecda0c1f45 src/protocols/msn/session.c
--- a/src/protocols/msn/session.c	Tue Apr 27 02:33:29 2004 +0000
+++ b/src/protocols/msn/session.c	Tue Apr 27 02:42:01 2004 +0000
@@ -111,26 +111,13 @@
 
 	session->connected = TRUE;
 
-	if (session->http_method)
-	{
-		session->notification_conn = msn_notification_new(session);
+	session->notification_conn = msn_notification_new(session);
 
-		if (msn_notification_connect(session->notification_conn,
-									 "gateway.messenger.hotmail.com", 80))
-		{
-			return TRUE;
-		}
-	}
-	else
-	{
-		session->notification_conn = msn_notification_new(session);
-
-		if (msn_notification_connect(session->notification_conn,
+	if (msn_notification_connect(session->notification_conn,
 									 session->dispatch_server,
 									 session->dispatch_port))
-		{
-			return TRUE;
-		}
+	{
+		return TRUE;
 	}
 
 	return FALSE;