From 052f82ecce5ebd44ea631bc0a8affb1864267301 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 30 Aug 2016 16:07:17 +0000 Subject: YAHOO Japan removed git-svn-id: http://svn.miranda-ng.org/main/trunk@17219 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Yahoo/res/Yahoo.rc | 2 -- protocols/Yahoo/src/options.cpp | 21 ++------------------- protocols/Yahoo/src/proto.cpp | 6 +----- protocols/Yahoo/src/resource.h | 1 - protocols/Yahoo/src/services.cpp | 2 +- protocols/Yahoo/src/stdafx.h | 1 - protocols/Yahoo/src/yahoo.cpp | 13 ++++--------- 7 files changed, 8 insertions(+), 38 deletions(-) diff --git a/protocols/Yahoo/res/Yahoo.rc b/protocols/Yahoo/res/Yahoo.rc index 903bb386d1..550b71ab65 100644 --- a/protocols/Yahoo/res/Yahoo.rc +++ b/protocols/Yahoo/res/Yahoo.rc @@ -47,7 +47,6 @@ BEGIN EDITTEXT IDC_HANDLE,54,0,131,12,ES_AUTOHSCROLL LTEXT "Password:",IDC_STATIC,0,16,53,12 EDITTEXT IDC_PASSWORD,54,16,131,12,ES_PASSWORD | ES_AUTOHSCROLL - CONTROL "Yahoo Japan",IDC_YAHOO_JAPAN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,0,32,140,12 CONTROL "Create a new Yahoo account",IDC_NEWYAHOOACCOUNTLINK, "Hyperlink",WS_TABSTOP,0,48,174,12 END @@ -63,7 +62,6 @@ BEGIN LTEXT "Port:",IDC_STATIC,16,42,25,10 EDITTEXT IDC_YAHOOPORT,68,40,29,12,ES_AUTOHSCROLL | ES_NUMBER PUSHBUTTON "Reset",IDC_RESETSERVER,244,24,40,12 - CONTROL "Yahoo Japan",IDC_YAHOO_JAPAN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,58,140,10 END IDD_OPT_YAHOO_IGNORE DIALOGEX 0, 0, 296, 220 diff --git a/protocols/Yahoo/src/options.cpp b/protocols/Yahoo/src/options.cpp index 5fe42858d8..f793642e52 100644 --- a/protocols/Yahoo/src/options.cpp +++ b/protocols/Yahoo/src/options.cpp @@ -65,7 +65,7 @@ static INT_PTR CALLBACK DlgProcYahooOpts(HWND hwndDlg, UINT msg, WPARAM wParam, switch (LOWORD(wParam)) { case IDC_NEWYAHOOACCOUNTLINK: - Utils_OpenUrl(ppro->getByte("YahooJapan", 0) ? "http://edit.yahoo.co.jp/config/eval_register" : "http://edit.yahoo.com/config/eval_register"); + Utils_OpenUrl("http://edit.yahoo.com/config/eval_register"); return TRUE; //case IDC_DISABLE_UTF8: @@ -168,14 +168,9 @@ static INT_PTR CALLBACK DlgProcYahooOptsConn(HWND hwndDlg, UINT msg, WPARAM wPar SetDlgItemTextA(hwndDlg, IDC_LOGINSERVER, dbv.pszVal); db_free(&dbv); } - else SetDlgItemTextA(hwndDlg, IDC_LOGINSERVER, - ppro->getByte("YahooJapan", 0) - ? YAHOO_DEFAULT_JAPAN_LOGIN_SERVER - : YAHOO_DEFAULT_LOGIN_SERVER); + else SetDlgItemTextA(hwndDlg, IDC_LOGINSERVER, YAHOO_DEFAULT_LOGIN_SERVER); SetDlgItemInt(hwndDlg, IDC_YAHOOPORT, ppro->getWord(YAHOO_LOGINPORT, YAHOO_DEFAULT_PORT), FALSE); - - SetButtonCheck(hwndDlg, IDC_YAHOO_JAPAN, ppro->getByte("YahooJapan", 0)); return TRUE; case WM_COMMAND: @@ -185,16 +180,6 @@ static INT_PTR CALLBACK DlgProcYahooOptsConn(HWND hwndDlg, UINT msg, WPARAM wPar SetDlgItemInt(hwndDlg, IDC_YAHOOPORT, YAHOO_DEFAULT_PORT, FALSE); SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); break; - - case IDC_YAHOO_JAPAN: - SetDlgItemTextA(hwndDlg, IDC_LOGINSERVER, - (IsDlgButtonChecked(hwndDlg, IDC_YAHOO_JAPAN) == BST_CHECKED) ? -YAHOO_DEFAULT_JAPAN_LOGIN_SERVER : - YAHOO_DEFAULT_LOGIN_SERVER); - // fall through and enable apply button - - SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); - break; } if (HIWORD(wParam) == EN_CHANGE && (HWND)lParam == GetFocus()) @@ -227,8 +212,6 @@ YAHOO_DEFAULT_JAPAN_LOGIN_SERVER : ppro->setWord(YAHOO_LOGINPORT, port); - ppro->setByte("YahooJapan", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_YAHOO_JAPAN)); - if (reconnectRequired && ppro->m_bLoggedIn) MessageBox(hwndDlg, TranslateT("These changes will take effect the next time you connect to the Yahoo network."), TranslateT("Yahoo options"), MB_OK); diff --git a/protocols/Yahoo/src/proto.cpp b/protocols/Yahoo/src/proto.cpp index 3d47152262..6e74047802 100644 --- a/protocols/Yahoo/src/proto.cpp +++ b/protocols/Yahoo/src/proto.cpp @@ -668,13 +668,11 @@ INT_PTR CALLBACK first_run_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM db_free(&dbv); } - SetButtonCheck(hwndDlg, IDC_YAHOO_JAPAN, ppro->getByte("YahooJapan", 0)); return TRUE; case WM_COMMAND: if (LOWORD(wParam) == IDC_NEWYAHOOACCOUNTLINK) { - Utils_OpenUrl(IsDlgButtonChecked(hwndDlg, IDC_YAHOO_JAPAN) == 1 ? - "http://edit.yahoo.co.jp/config/eval_register" : "http://edit.yahoo.com/config/eval_register"); + Utils_OpenUrl("http://edit.yahoo.com/config/eval_register"); return TRUE; } @@ -682,7 +680,6 @@ INT_PTR CALLBACK first_run_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM switch (LOWORD(wParam)) { case IDC_HANDLE: case IDC_PASSWORD: - case IDC_YAHOO_JAPAN: SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); } } @@ -717,7 +714,6 @@ INT_PTR CALLBACK first_run_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM } ppro->setString(YAHOO_PASSWORD, str); - ppro->setByte("YahooJapan", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_YAHOO_JAPAN)); if (reconnectRequired) { ppro->delSetting(YAHOO_PWTOKEN); diff --git a/protocols/Yahoo/src/resource.h b/protocols/Yahoo/src/resource.h index ba15e24ad2..c7aba4f76e 100644 --- a/protocols/Yahoo/src/resource.h +++ b/protocols/Yahoo/src/resource.h @@ -59,7 +59,6 @@ #define IDC_SHOW_ERRORS 1478 #define IDC_SHOW_AVATARS 1479 #define IDC_MAIL_AUTOLOGIN 1480 -#define IDC_YAHOO_JAPAN 1481 #define IDC_MSG 1482 #define IDC_ROOMNAME 1483 #define IDC_CCLIST 1484 diff --git a/protocols/Yahoo/src/services.cpp b/protocols/Yahoo/src/services.cpp index f5f602139c..9140118921 100644 --- a/protocols/Yahoo/src/services.cpp +++ b/protocols/Yahoo/src/services.cpp @@ -291,7 +291,7 @@ INT_PTR __cdecl CYahooProto::OnShowMyProfileCommand(WPARAM, LPARAM) //======================================================= INT_PTR __cdecl CYahooProto::OnGotoMailboxCommand(WPARAM, LPARAM) { - OpenURL(getByte("YahooJapan", 0) ? "http://mail.yahoo.co.jp/" : "http://mail.yahoo.com/", 1); + OpenURL("http://mail.yahoo.com/", 1); return 0; } diff --git a/protocols/Yahoo/src/stdafx.h b/protocols/Yahoo/src/stdafx.h index e35b8dcfd5..381af7ee77 100644 --- a/protocols/Yahoo/src/stdafx.h +++ b/protocols/Yahoo/src/stdafx.h @@ -63,7 +63,6 @@ #define YAHOO_CUSTSTATDB "CustomStat" #define YAHOO_DEFAULT_PORT 5050 #define YAHOO_DEFAULT_LOGIN_SERVER "mcs.msg.yahoo.com" -#define YAHOO_DEFAULT_JAPAN_LOGIN_SERVER "cs.yahoo.co.jp" #define YAHOO_CUSTOM_STATUS 99 extern int do_yahoo_debug; diff --git a/protocols/Yahoo/src/yahoo.cpp b/protocols/Yahoo/src/yahoo.cpp index 2d5df96084..d31b2f5240 100644 --- a/protocols/Yahoo/src/yahoo.cpp +++ b/protocols/Yahoo/src/yahoo.cpp @@ -1451,16 +1451,13 @@ void CYahooProto::ext_login(enum yahoo_status login_mode) /** * Implementing Yahoo 9 2 Stage Login using their VIP server/services */ - NETLIBHTTPREQUEST nlhr = { 0 }, *nlhrReply; - char z[4096]; - - mir_snprintf(z, "http://%s%s", getByte("YahooJapan", 0) != 0 ? "cs1.msg.vip.ogk.yahoo.co.jp" : "vcs.msg.yahoo.com", "/capacity"); + NETLIBHTTPREQUEST nlhr = { 0 }; nlhr.cbSize = sizeof(nlhr); nlhr.requestType = REQUEST_GET; nlhr.flags = NLHRF_HTTP11; - nlhr.szUrl = z; + nlhr.szUrl = "http://vcs.msg.yahoo.com/capacity"; - nlhrReply = (NETLIBHTTPREQUEST*)CallService(MS_NETLIB_HTTPTRANSACTION, (WPARAM)g_hNetlibUser, (LPARAM)&nlhr); + NETLIBHTTPREQUEST *nlhrReply = (NETLIBHTTPREQUEST*)CallService(MS_NETLIB_HTTPTRANSACTION, (WPARAM)g_hNetlibUser, (LPARAM)&nlhr); if (nlhrReply) { if (nlhrReply->resultCode == 200 && nlhrReply->pData != NULL) { char *c = strstr(nlhrReply->pData, "CS_IP_ADDRESS="); @@ -1491,9 +1488,7 @@ void CYahooProto::ext_login(enum yahoo_status login_mode) strncpy_s(host, dbv.pszVal, _TRUNCATE); db_free(&dbv); } - else { - strncpy_s(host, (getByte("YahooJapan", 0) ? YAHOO_DEFAULT_JAPAN_LOGIN_SERVER : YAHOO_DEFAULT_LOGIN_SERVER), _TRUNCATE); - } + 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)); -- cgit v1.2.3