From 9d50daf8ae4c81aa1b3bfd665f38a3c78068da23 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Wed, 31 Aug 2016 12:38:00 +0000
Subject: minor code cleaning

git-svn-id: http://svn.miranda-ng.org/main/trunk@17227 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/Yahoo/src/proto.cpp | 1 -
 protocols/Yahoo/src/yahoo.cpp | 8 +++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'protocols/Yahoo')

diff --git a/protocols/Yahoo/src/proto.cpp b/protocols/Yahoo/src/proto.cpp
index 6e74047802..ed7e110a8d 100644
--- a/protocols/Yahoo/src/proto.cpp
+++ b/protocols/Yahoo/src/proto.cpp
@@ -630,7 +630,6 @@ int __cdecl CYahooProto::OnEvent(PROTOEVENTTYPE eventType, WPARAM wParam, LPARAM
 {
 	switch (eventType) {
 	case EV_PROTO_ONLOAD:    return OnModulesLoadedEx(0, 0);
-		//case EV_PROTO_ONEXIT:    return OnPreShutdown( 0, 0);
 	case EV_PROTO_ONOPTIONS: return OnOptionsInit(wParam, lParam);
 
 	case EV_PROTO_ONMENU:
diff --git a/protocols/Yahoo/src/yahoo.cpp b/protocols/Yahoo/src/yahoo.cpp
index d31b2f5240..499528b520 100644
--- a/protocols/Yahoo/src/yahoo.cpp
+++ b/protocols/Yahoo/src/yahoo.cpp
@@ -1437,7 +1437,7 @@ char * CYahooProto::ext_send_https_request(yahoo_data *yd, const char *host, con
 
 void CYahooProto::ext_login(enum yahoo_status login_mode)
 {
-	char host[128], fthost[128], login_host[128];
+	char host[128];
 	int port = 0;
 	DBVARIANT dbv;
 #ifdef HTTP_GATEWAY				
@@ -1491,8 +1491,6 @@ void CYahooProto::ext_login(enum yahoo_status login_mode)
 		else strncpy_s(host, YAHOO_DEFAULT_LOGIN_SERVER, _TRUNCATE);
 	}
 
-	mir_strncpy(fthost, getByte("YahooJapan", 0) ? "filetransfer.msg.yahoo.co.jp" : "filetransfer.msg.yahoo.com", sizeof(fthost));
-	mir_strncpy(login_host, getByte("YahooJapan", 0) ? "login.yahoo.co.jp" : "login.yahoo.com", sizeof(login_host));
 	port = getWord(NULL, YAHOO_LOGINPORT, YAHOO_DEFAULT_PORT);
 
 #ifdef HTTP_GATEWAY			
@@ -1508,12 +1506,12 @@ void CYahooProto::ext_login(enum yahoo_status login_mode)
 	m_id = yahoo_init_with_attributes(m_yahoo_id, m_password, m_pw_token,
 		"pager_host", host,
 		"pager_port", port,
-		"filetransfer_host", fthost,
+		"filetransfer_host", "filetransfer.msg.yahoo.com",
 		"picture_checksum", getDword("AvatarHash", -1),
 #ifdef HTTP_GATEWAY			
 		"web_messenger", iHTTPGateway,
 #endif
-		"login_host", login_host,
+		"login_host", "login.yahoo.com",
 		NULL);
 
 	m_status = YAHOO_STATUS_OFFLINE;
-- 
cgit v1.2.3