pidgin3: comparison libpurple/protocols/yahoo/ymsg.c

-:a7b373724f6c
+:3032113d656e
 #if TRY_WEBMESSENGER_LOGIN
 static void
 yahoo_login_page_cb(PurpleHttpConnection *http_conn,
 	PurpleHttpResponse *response, gpointer _unused);
 #endif /* TRY_WEBMESSENGER_LOGIN */
-static gboolean yahoo_is_japan(PurpleAccount *account)
-{
-	return purple_strequal(purple_account_get_protocol_id(account), "prpl-yahoojp");
-}
 static void yahoo_update_status(PurpleConnection *gc, const char *name, YahooFriend *f)
 {
 	char *status = NULL;
 			*n = *p;
 	}
 	*n = '\0';
+	/* XXX: Is this related to Yahoo! Japan? If so, it should be removed. -mmcco */
 	if (strstr(text, "\033$B"))
 		converted = g_convert(new, n - new, OUT_CHARSET, "iso-2022-jp", NULL, NULL, NULL);
 	if (!converted)
 		converted = g_convert(new, n - new, OUT_CHARSET, "iso-8859-1", NULL, NULL, NULL);
 	g_free(new);
 }
 static void yahoo_process_mail(PurpleConnection *gc, struct yahoo_packet *pkt)
 {
 	PurpleAccount *account = purple_connection_get_account(gc);
-	YahooData *yd = purple_connection_get_protocol_data(gc);
 	const char *who = NULL;
 	const char *email = NULL;
 	const char *subj = NULL;
-	const char *yahoo_mail_url = (yd->jp? YAHOOJP_MAIL_URL: YAHOO_MAIL_URL);
+	const char *yahoo_mail_url = YAHOO_MAIL_URL;
 	int count = 0;
 	GSList *l = pkt->hash;
 	if (!purple_account_get_check_mail(account))
 		return;
 					1, name,
 					0, name,
 					277, yd->cookie_y,
 					278, yd->cookie_t,
 					307, base64_string,
-					244, yd->jp ? YAHOOJP_CLIENT_VERSION_ID : YAHOO_CLIENT_VERSION_ID,
+					244, YAHOO_CLIENT_VERSION_ID,
 					2, name,
 					2, "1",
 					59, yd->cookie_b,
-					98, purple_account_get_string(account, "room_list_locale", yd->jp ? "jp" : "us"),
+					98, purple_account_get_string(account, "room_list_locale", "us"),
-					135, yd->jp ? YAHOOJP_CLIENT_VERSION : YAHOO_CLIENT_VERSION);
+					135, YAHOO_CLIENT_VERSION);
 	} else { /* don't try to send an empty B cookie - the server will be mad */
 		yahoo_packet_hash(pkt, "sssssssss",
 					1, name,
 					0, name,
 					277, yd->cookie_y,
 					278, yd->cookie_t,
 					307, base64_string,
-					244, yd->jp ? YAHOOJP_CLIENT_VERSION_ID : YAHOO_CLIENT_VERSION_ID,
+					244, YAHOO_CLIENT_VERSION_ID,
 					2, name,
 					2, "1",
-					98, purple_account_get_string(account, "room_list_locale", yd->jp ? "jp" : "us"),
+					98, purple_account_get_string(account, "room_list_locale", "us"),
-					135, yd->jp ? YAHOOJP_CLIENT_VERSION : YAHOO_CLIENT_VERSION);
+					135, YAHOO_CLIENT_VERSION);
 	}
 	if (yd->picture_checksum)
 		yahoo_packet_hash_int(pkt, 192, yd->picture_checksum);
 	yahoo_packet_send_and_free(pkt, yd);
 			g_free(auth_data->seed);
 			g_free(auth_data);
 			g_free(token);
 		}
 		else {
-			/* OK to login, correct information provided */
-			gboolean yahoojp = yahoo_is_japan(account);
 			PurpleHttpRequest *req;
 			req = purple_http_request_new(NULL);
-			purple_http_request_set_url_printf(req,
+			purple_http_request_set_url_printf(req, YAHOO_LOGIN_URL, token);
-				yahoojp ? YAHOOJP_LOGIN_URL : YAHOO_LOGIN_URL,
-				token);
 			purple_http_request_header_set(req, "User-Agent",
 				YAHOO_CLIENT_USERAGENT);
 			purple_http_connection_set_add(yd->http_reqs,
 				purple_http_request(gc, req,
 					yahoo_auth16_stage2, auth_data));
 }
 static void yahoo_auth16_stage1(PurpleConnection *gc, const char *seed)
 {
 	YahooData *yd = purple_connection_get_protocol_data(gc);
-	PurpleAccount *account = purple_connection_get_account(gc);
 	PurpleHttpRequest *req;
 	struct yahoo_auth_data *auth_data = NULL;
 	char *encoded_username;
 	char *encoded_password;
-	gboolean yahoojp = yahoo_is_japan(account);
 	purple_debug_info("yahoo", "Authentication: In yahoo_auth16_stage1\n");
 	if(!purple_ssl_is_supported()) {
 		purple_connection_error(gc, PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT, _("SSL support unavailable"));
 	encoded_username = g_strdup(purple_url_encode(purple_account_get_username(purple_connection_get_account(gc))));
 	encoded_password = g_strdup(purple_url_encode(purple_connection_get_password(gc)));
 	req = purple_http_request_new(NULL);
-	purple_http_request_set_url_printf(req,
+	purple_http_request_set_url_printf(req, YAHOO_TOKEN_URL,
-		yahoojp ? YAHOOJP_TOKEN_URL : YAHOO_TOKEN_URL,
 		encoded_username, encoded_password, purple_url_encode(seed));
 	purple_http_request_header_set(req, "User-Agent", YAHOO_CLIENT_USERAGENT);
 	purple_http_connection_set_add(yd->http_reqs, purple_http_request(gc,
 		req, yahoo_auth16_stage1_cb, auth_data));
 	purple_http_request_unref(req);
 	size_t pkt_len;
 	gssize written;
 	guchar *raw_packet;
 	/*build the raw packet and send it to the host*/
-	pkt_len = yahoo_packet_build(pkt, 0, 0, 0, &raw_packet);
+	pkt_len = yahoo_packet_build(pkt, 0, 0, &raw_packet);
 	written = write(source, raw_packet, pkt_len);
 	if (written < 0 || (gsize)written != pkt_len)
 		purple_debug_warning("yahoo","p2p: couldn't write to the source\n");
 	g_free(raw_packet);
 }
 	if (!purple_http_response_is_successful(response)) {
 		purple_debug_error("yahoo", "Unable to retrieve server info: %s\n",
 			purple_http_response_get_error(response));
-		if(yahoo_is_japan(a)) { /* We don't know fallback hosts for Yahoo Japan :( */
+		if(purple_proxy_connect(gc, a, YAHOO_PAGER_HOST_FALLBACK, port,
+				yahoo_got_connected, gc) == NULL) {
 			purple_connection_error(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-					_("Unable to connect: The server returned an empty response."));
+					_("Unable to connect"));
-		} else {
-				if(purple_proxy_connect(gc, a, YAHOO_PAGER_HOST_FALLBACK, port,
-							yahoo_got_connected, gc) == NULL) {
-					purple_connection_error(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-							_("Unable to connect"));
-				}
 		}
 	} else {
 		got_data = purple_http_response_get_data(response, NULL);
 		strings = g_strsplit(got_data, "\r\n", -1);
 								_("Unable to connect"));
 		} else {
 			purple_debug_error("yahoo", "No CS address retrieved!  Server "
 					"response:\n%s\n", got_data);
-			if(yahoo_is_japan(a)) { /* We don't know fallback hosts for Yahoo Japan :( */
+			if(purple_proxy_connect(gc, a, YAHOO_PAGER_HOST_FALLBACK, port,
+					yahoo_got_connected, gc) == NULL) {
 				purple_connection_error(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-						_("Unable to connect: The server's response did not contain "
+						_("Unable to connect"));
-							"the necessary information"));
+			}
-			} else
-				if(purple_proxy_connect(gc, a, YAHOO_PAGER_HOST_FALLBACK, port,
-							yahoo_got_connected, gc) == NULL) {
-					purple_connection_error(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-							_("Unable to connect"));
-				}
 		}
 	}
 	g_strfreev(strings);
 	g_free(cs_server);
 	purple_connection_update_progress(gc, _("Connecting"), 1, 2);
 	purple_connection_set_display_name(gc, purple_account_get_username(account));
 	yd->gc = gc;
-	yd->jp = yahoo_is_japan(account);
 	yd->yahoo_local_p2p_server_fd = -1;
 	yd->fd = -1;
 	yd->txhandler = 0;
 	/* TODO: Is there a good grow size for the buffer? */
 	yd->txbuf = purple_circular_buffer_new(0);
 	yahoo_picture_check(account);
 	/* Get the pager server.  Actually start connecting in the callback since we
 	 * must have the contents of the HTTP response to proceed. */
-	req = purple_http_request_new(yd->jp ? YAHOOJP_PAGER_HOST_REQ_URL :
+	req = purple_http_request_new(YAHOO_PAGER_HOST_REQ_URL);
-		YAHOO_PAGER_HOST_REQ_URL);
 	purple_http_request_header_set(req, "User-Agent", YAHOO_CLIENT_USERAGENT);
 	purple_http_connection_set_add(yd->http_reqs, purple_http_request(gc,
 		req, yahoo_got_pager_server, yd));
 	purple_http_request_unref(req);
 	PurpleHttpResponse *response, gpointer _unused)
 {
 	PurpleConnection *gc =
 		purple_http_conn_get_purple_connection(http_conn);
 	gchar *url;
-	YahooData *yd = purple_connection_get_protocol_data(gc);
 	PURPLE_ASSERT_CONNECTION_IS_VALID(gc);
 	if (!purple_http_response_is_successful(response)) {
 		purple_debug_error("yahoo",
 			"Requesting mail login token failed: %s\n",
 			purple_http_response_get_error(response));
-		url = g_strdup(yd->jp ? YAHOOJP_MAIL_URL : YAHOO_MAIL_URL);
+		url = g_strdup(YAHOO_MAIL_URL);
 	} else {
 		/* Should we not be hardcoding the rd url? */
 		gchar *token;
 		token = g_strdup(purple_http_response_get_data(response, NULL));
 		g_strstrip(token);
 static void yahoo_show_inbox(PurpleProtocolAction *action)
 {
 	/* Setup a cookie that can be used by the browser */
-	/* XXX I have no idea how this will work with Yahoo! Japan. */
 	PurpleConnection *gc = action->connection;
 	YahooData *yd = purple_connection_get_protocol_data(gc);
 	PurpleHttpRequest *req;
 	PurpleHttpCookieJar *cookiejar;

Mercurial > pidgin3 / file comparison

comparison: libpurple/protocols/yahoo/ymsg.c

libpurple/protocols/yahoo/ymsg.c