changeset 8299:7402101c0319

[gaim-migrate @ 9023] Ladies and gentlemen, MSN port 80 connect method. committer: Tailor Script <[e-mail]>

--- a/ChangeLog	Fri Feb 20 21:37:45 2004 +0000
+++ b/ChangeLog	Fri Feb 20 22:11:56 2004 +0000
@@ -9,6 +9,7 @@
 	  Get User Info dialogs.
 	* Non-ascii character support in AIM chats (Uli Luckas and Marco Ziech)
 	* Vastly improved browser opening, with tab support! (Nathan Fredrickson)
+	* Added support for connecting to MSN using the port 80 method.
 	* Support for Mozilla Firefox (Chris Friesen and Nathan Fredrickson)
 	* Local IP address information can be changed in Preferences
 	  (Tim Ringenbach)

--- a/src/protocols/msn/httpmethod.c	Fri Feb 20 21:37:45 2004 +0000
+++ b/src/protocols/msn/httpmethod.c	Fri Feb 20 22:11:56 2004 +0000
@@ -58,8 +58,10 @@
 
 		if (servconn->http_data->dirty)
 		{
+#if 0
 			gaim_debug_info("msn", "Polling server %s.\n",
 							servconn->http_data->gateway_ip);
+#endif
 			msn_http_servconn_poll(servconn);
 		}
 	}
@@ -72,7 +74,6 @@
 {
 	if (session->http_poll_timer)
 	{
-		gaim_debug(GAIM_DEBUG_INFO, "msn", "Stopping timer\n");
 		gaim_timeout_remove(session->http_poll_timer);
 		session->http_poll_timer = 0;
 	}
@@ -83,8 +84,7 @@
 {
 	stop_timer(session);
 
-	gaim_debug(GAIM_DEBUG_INFO, "msn", "Starting timer\n");
-	session->http_poll_timer = gaim_timeout_add(5000, http_poll, session);
+	session->http_poll_timer = gaim_timeout_add(2000, http_poll, session);
 }
 
 void
@@ -179,7 +179,7 @@
 
 	g_free(params);
 
-#if 1
+#if 0
 	gaim_debug_misc("msn", "Writing HTTP to fd %d: {%s}\n",
 					servconn->fd, temp);
 #endif
@@ -239,7 +239,9 @@
 		servconn->http_data->session_id,
 		servconn->http_data->gateway_ip);
 
+#if 0
 	gaim_debug_misc("msn", "Writing to HTTP: {%s}\n", temp);
+#endif
 
 	s = write(servconn->fd, temp, strlen(temp));
 
@@ -271,7 +273,9 @@
 	g_return_val_if_fail(ret_size != NULL, FALSE);
 	g_return_val_if_fail(error    != NULL, FALSE);
 
+#if 0
 	gaim_debug_info("msn", "parsing data {%s} from fd %d\n", buf, servconn->fd);
+#endif
 	servconn->http_data->waiting_response = FALSE;
 
 	gc = gaim_account_get_connection(servconn->session->account);
@@ -317,7 +321,9 @@
 	s += 4; /* Skip \r\n */
 	body = g_strndup(s, size - (s - buf));
 
+#if 0
 	gaim_debug_misc("msn", "Incoming HTTP buffer: {%s\r\n%s}", headers, body);
+#endif
 
 	if ((s = strstr(headers, "Content-Length: ")) != NULL)
 	{

--- a/src/protocols/msn/servconn.c	Fri Feb 20 21:37:45 2004 +0000
+++ b/src/protocols/msn/servconn.c	Fri Feb 20 22:11:56 2004 +0000
@@ -241,6 +241,9 @@
 	if (session->http_method)
 	{
 		servconn->http_data->gateway_ip = g_strdup(servconn->server);
+
+		g_free(servconn->server);
+		servconn->server = g_strdup("gateway.messenger.hotmail.com");
 		servconn->port = 80;
 	}