diff src/protocols/yahoo/yahoo.c @ 8045:cd3a2cef5112

[gaim-migrate @ 8729] Yahoo works. committer: Tailor Script <[e-mail]>

--- a/src/protocols/yahoo/yahoo.c	Sat Jan 10 02:30:31 2004 +0000
+++ b/src/protocols/yahoo/yahoo.c	Sat Jan 10 03:26:09 2004 +0000
@@ -1850,7 +1850,7 @@
 	}
 
 	if (source < 0) {
-		gaim_connection_error(gc, _("Unable to connect."));
+		gaim_connection_error(gc, _("Unable to connect"));
 		return;
 	}
 
@@ -1881,7 +1881,7 @@
 	}
 
 	if (source < 0) {
-		gaim_connection_error(gc, _("Unable to connect."));
+		gaim_connection_error(gc, _("Unable to connect"));
 		return;
 	}
 
@@ -1909,7 +1909,6 @@
 	int len, o = 0;
 
 	len = read(source, buf, sizeof(buf));
-
 	if (len <= 0  || strncmp(buf, "HTTP/1.0 302", strlen("HTTP/1.0 302"))) {
 		gaim_connection_error(gc, _("Unable to read"));
 		return;
@@ -1931,9 +1930,8 @@
 	yd->auth = g_strdup(buf2);
 	gaim_input_remove(gc->inpa);
 	close(source);
-
 	/* Now we have our cookies to login with.  I'll go get the milk. */
-	if (gaim_proxy_connect(account, "wcs1.msg.sc5.yahoo.com",
+	if (gaim_proxy_connect(account, "wcs2.msg.dcn.yahoo.com",
 			       gaim_account_get_int(account, "port", YAHOO_PAGER_PORT),
 			       yahoo_got_web_connected, gc) != 0) {
 		gaim_connection_error(gc, _("Connection problem"));
@@ -1946,7 +1944,7 @@
 	GaimConnection *gc = data;
 	struct yahoo_data *yd = gc->proto_data;
 	if (source < 0) {
-		gaim_connection_error(gc, _("Unable to connect."));
+		gaim_connection_error(gc, _("Unable to connect"));
 		return;
 	}
 	write(source, yd->auth, strlen(yd->auth));
@@ -2042,7 +2040,6 @@
 	url = g_string_append(url, "&.hash=1&.md5=1 HTTP/1.1\r\n"
 			      "Host: login.yahoo.com\r\n\r\n");
 	g_hash_table_destroy(hash);
-	
 	yd->auth = g_string_free(url, FALSE);
 	if (gaim_proxy_connect(account, "login.yahoo.com", 80, yahoo_got_cookies, gc) != 0) {
 		gaim_connection_error(gc, _("Connection problem"));
@@ -2705,10 +2702,9 @@
 
 	if (!yd->logged_in)
 		return;
-	
-	/* It seems to work better without this */
-	/* if (gc->account->perm_deny != 4)     */
-	/*	return;                         */
+
+	if (gc->account->perm_deny != 4)
+		return;
 
 	if (!who || who[0] == '\0')
 		return;