pidgin: 141f4010: Fix a mistake I made with the fallback c...

[rekkanoryo at pidgin.im]

-----------------------------------------------------------------
Revision: 141f4010f85161aa008307a388f75d651ef6d758
Ancestor: d6854bccda6ab4484ef57cac3867d4f02fb083e4
Author: rekkanoryo at pidgin.im
Date: 2010-06-14T14:10:42
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/141f4010f85161aa008307a388f75d651ef6d758

Modified files:
        libpurple/protocols/yahoo/libymsg.c

ChangeLog: 

Fix a mistake I made with the fallback code.  Refs #11986.

-------------- next part --------------
============================================================
--- libpurple/protocols/yahoo/libymsg.c	048656e6bbe4958a2ecaeac7f596cb934b8f7b80
+++ libpurple/protocols/yahoo/libymsg.c	5ab8f3bdabb7e62cf56623ed1d9f85e516a8aec4
@@ -3594,7 +3594,8 @@ static void yahoo_got_pager_server(Purpl
 	PurpleConnection *gc = yd->gc;
 	PurpleAccount *a = purple_connection_get_account(gc);
 	gchar **strings = NULL, *cs_server = NULL;
-	int port = 0, stringslen = 0;
+	int port = purple_account_get_int(a, "port", YAHOO_PAGER_PORT);
+	int stringslen = 0;
 
 	yd->url_datas = g_slist_remove(yd->url_datas, url_data);
 
@@ -3630,8 +3631,6 @@ static void yahoo_got_pager_server(Purpl
 		}
 
 		if(cs_server) { /* got an address; get on with connecting */
-			port = purple_account_get_int(a, "port", YAHOO_PAGER_PORT);
-
 			if(purple_proxy_connect(gc, a, cs_server, port, yahoo_got_connected, gc) == NULL)
 				purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
 								_("Unable to connect"));
@@ -3699,7 +3698,7 @@ void yahoo_login(PurpleAccount *account)
 			proxy_ssl ? purple_connection_get_account(gc) : NULL,
 			yd->jp ? YAHOOJP_PAGER_HOST_REQ_URL : YAHOO_PAGER_HOST_REQ_URL,
 			use_whole_url ? TRUE : FALSE,
-			YAHOO_CLIENT_USERAGENT, TRUE, NULL, FALSE, -1,
+			YAHOO_CLIENT_USERAGENT, FALSE, NULL, FALSE, -1,
 			yahoo_got_pager_server, yd);
 	if (url_data)
 		yd->url_datas = g_slist_prepend(yd->url_datas, url_data);