changeset 8831:ffecda0c1f45

[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>
author Christian Hammond <chipx86@chipx86.com>
date Tue, 27 Apr 2004 02:42:01 +0000
parents f8038b1f7449
children c313e3b1f2c0
files src/protocols/msn/servconn.c src/protocols/msn/session.c
diffstat 2 files changed, 4 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- 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,
--- 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;