From bebafc42ab6199e86d4c2c901fac8d091bfffef0 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Tue, 6 Mar 2018 20:24:07 +0300 Subject: some fixes --- protocols/IcqOscarJ/src/icq_popups.cpp | 4 ---- protocols/JabberG/src/jabber_treelist.cpp | 7 ++----- protocols/MSN/src/msn_auth.cpp | 2 +- protocols/MSN/src/msn_misc.cpp | 8 +++----- protocols/MSN/src/skylogin/login.c | 3 ++- protocols/SkypeWeb/src/skype_profile.cpp | 7 ------- 6 files changed, 8 insertions(+), 23 deletions(-) (limited to 'protocols') diff --git a/protocols/IcqOscarJ/src/icq_popups.cpp b/protocols/IcqOscarJ/src/icq_popups.cpp index 28de27d6f7..e067fd966a 100644 --- a/protocols/IcqOscarJ/src/icq_popups.cpp +++ b/protocols/IcqOscarJ/src/icq_popups.cpp @@ -278,12 +278,8 @@ int CIcqProto::ShowPopupMsg(MCONTACT hContact, const char *szTitle, const char * make_unicode_string_static( ICQTranslateUtfStatic(szTitle, str, sizeof(str)), ppd.lpwzContactName, MAX_CONTACTNAME); make_unicode_string_static( ICQTranslateUtfStatic(szMsg, str, sizeof(str)), ppd.lpwzText, MAX_SECONDLINE); ppd.lchContact = hContact; - ppd.lchIcon = ppd.lchIcon; - ppd.colorBack = ppd.colorBack; - ppd.colorText = ppd.colorText; ppd.PluginWindowProc = nullptr; ppd.PluginData = nullptr; - ppd.iSeconds = ppd.iSeconds; return PUAddPopupT(&ppd); } return -1; // Failure diff --git a/protocols/JabberG/src/jabber_treelist.cpp b/protocols/JabberG/src/jabber_treelist.cpp index fcfba8f7b7..7a960fedd4 100644 --- a/protocols/JabberG/src/jabber_treelist.cpp +++ b/protocols/JabberG/src/jabber_treelist.cpp @@ -367,11 +367,8 @@ BOOL TreeList_ProcessMessage(HWND hwnd, UINT msg, WPARAM, LPARAM lparam, UINT id nmtv.itemNew.hItem = (HTREEITEM)lvi.lParam; SendMessage(hwnd, WM_NOTIFY, lpnmia->hdr.idFrom, (LPARAM)&nmtv); - if (data->mode == TLM_REPORT) - { - ListView_DeleteAllItems(lpnmia->hdr.hwndFrom); - TreeList_Update(lpnmia->hdr.hwndFrom); - } + ListView_DeleteAllItems(lpnmia->hdr.hwndFrom); + TreeList_Update(lpnmia->hdr.hwndFrom); } break; diff --git a/protocols/MSN/src/msn_auth.cpp b/protocols/MSN/src/msn_auth.cpp index e75fded15c..f9420029cd 100644 --- a/protocols/MSN/src/msn_auth.cpp +++ b/protocols/MSN/src/msn_auth.cpp @@ -1133,7 +1133,7 @@ int CMsnProto::MSN_AuthOAuth(void) int loginRet; /* Do Login via Skype login server, if not possible switch to SkypeWebExperience login */ if ((loginRet = LoginSkypeOAuth(pRefreshToken)) < 1) { - if (loginRet < 0) bLogin = true; else retVal = 0; + retVal = 0; } else { /* SkyLogin succeeded, request required tokens */ diff --git a/protocols/MSN/src/msn_misc.cpp b/protocols/MSN/src/msn_misc.cpp index dc509db31b..78ec94f5dd 100644 --- a/protocols/MSN/src/msn_misc.cpp +++ b/protocols/MSN/src/msn_misc.cpp @@ -1025,13 +1025,11 @@ char* TWinErrorCode::getText() if (mErrorText == nullptr) return nullptr; - int tBytes = 0; mErrorText = (char*)mir_alloc(256); - if (tBytes == 0) - tBytes = FormatMessageA( - FORMAT_MESSAGE_FROM_SYSTEM, nullptr, - mErrorCode, LANG_NEUTRAL, mErrorText, 256, nullptr); + int tBytes = FormatMessageA( + FORMAT_MESSAGE_FROM_SYSTEM, nullptr, + mErrorCode, LANG_NEUTRAL, mErrorText, 256, nullptr); if (tBytes == 0) tBytes = mir_snprintf(mErrorText, 256, "unknown Windows error code %d", mErrorCode); diff --git a/protocols/MSN/src/skylogin/login.c b/protocols/MSN/src/skylogin/login.c index 406ebe279e..348c582b7b 100644 --- a/protocols/MSN/src/skylogin/login.c +++ b/protocols/MSN/src/skylogin/login.c @@ -74,7 +74,8 @@ static int SendAuthentificationBlobLS(Skype_Inst *pInst, LSConnection *pConn, co uchar *Browser; uchar *Mark; uchar *MarkObjL; - uint Idx, Size, Crc, BSize, ret = 0; + uint Size, Crc, BSize, ret = 0; + int Idx; HttpsPacketHeader *HSHeader; uchar HSHeaderBuf[sizeof(HttpsPacketHeader)], RecvBuf[0x1000]; AES_KEY AesKey; diff --git a/protocols/SkypeWeb/src/skype_profile.cpp b/protocols/SkypeWeb/src/skype_profile.cpp index 6e704ce411..f658f7d916 100644 --- a/protocols/SkypeWeb/src/skype_profile.cpp +++ b/protocols/SkypeWeb/src/skype_profile.cpp @@ -53,7 +53,6 @@ void CSkypeProto::InitLanguages() result[L"km"] = L"Central Khmer"; result[L"ch"] = L"Chamorro"; result[L"ce"] = L"Chechen"; - result[L"ny"] = L"Chewa"; result[L"ny"] = L"Chichewa"; result[L"zh"] = L"Chinese"; result[L"za"] = L"Chuang"; @@ -66,7 +65,6 @@ void CSkypeProto::InitLanguages() result[L"hr"] = L"Croatian"; result[L"cs"] = L"Czech"; result[L"da"] = L"Danish"; - result[L"dv"] = L"Dhivehi"; result[L"dv"] = L"Divehi"; result[L"nl"] = L"Dutch"; result[L"dz"] = L"Dzongkha"; @@ -90,7 +88,6 @@ void CSkypeProto::InitLanguages() result[L"kl"] = L"Greenlandic"; result[L"gn"] = L"Guarani"; result[L"gu"] = L"Gujarati"; - result[L"ht"] = L"Haitian"; result[L"ht"] = L"Haitian Creole"; result[L"ha"] = L"Hausa"; result[L"he"] = L"Hebrew"; @@ -146,11 +143,9 @@ void CSkypeProto::InitLanguages() result[L"mi"] = L"Maori"; result[L"mr"] = L"Marathi"; result[L"mh"] = L"Marshallese"; - result[L"ro"] = L"Moldavian"; result[L"ro"] = L"Moldovan"; result[L"mn"] = L"Mongolian"; result[L"na"] = L"Nauru"; - result[L"nv"] = L"Navaho"; result[L"nv"] = L"Navajo"; result[L"nd"] = L"Ndebele, North"; result[L"nr"] = L"Ndebele, South"; @@ -172,7 +167,6 @@ void CSkypeProto::InitLanguages() result[L"cu"] = L"Old Slavonic"; result[L"or"] = L"Oriya"; result[L"om"] = L"Oromo"; - result[L"os"] = L"Ossetian"; result[L"os"] = L"Ossetic"; result[L"pi"] = L"Pali"; result[L"pa"] = L"Panjabi"; @@ -196,7 +190,6 @@ void CSkypeProto::InitLanguages() result[L"sn"] = L"Shona"; result[L"ii"] = L"Sichuan Yi"; result[L"sd"] = L"Sindhi"; - result[L"si"] = L"Sinhala"; result[L"si"] = L"Sinhalese"; result[L"sk"] = L"Slovak"; result[L"sl"] = L"Slovenian"; -- cgit v1.2.3