summaryrefslogtreecommitdiff
path: root/protocols/SkypeWeb
diff options
context:
space:
mode:
Diffstat (limited to 'protocols/SkypeWeb')
-rw-r--r--protocols/SkypeWeb/src/skype_avatars.cpp6
-rw-r--r--protocols/SkypeWeb/src/skype_chatrooms.cpp26
-rw-r--r--protocols/SkypeWeb/src/skype_db.h4
-rw-r--r--protocols/SkypeWeb/src/skype_events.cpp20
-rw-r--r--protocols/SkypeWeb/src/skype_files.cpp2
-rw-r--r--protocols/SkypeWeb/src/skype_login.cpp8
-rw-r--r--protocols/SkypeWeb/src/skype_messages.cpp4
-rw-r--r--protocols/SkypeWeb/src/skype_mslogin.cpp2
-rw-r--r--protocols/SkypeWeb/src/skype_popups.cpp6
-rw-r--r--protocols/SkypeWeb/src/skype_profile.cpp442
-rw-r--r--protocols/SkypeWeb/src/skype_proto.cpp2
-rw-r--r--protocols/SkypeWeb/src/skype_utils.cpp14
12 files changed, 268 insertions, 268 deletions
diff --git a/protocols/SkypeWeb/src/skype_avatars.cpp b/protocols/SkypeWeb/src/skype_avatars.cpp
index 626773ab1d..26ef2bcb81 100644
--- a/protocols/SkypeWeb/src/skype_avatars.cpp
+++ b/protocols/SkypeWeb/src/skype_avatars.cpp
@@ -68,7 +68,7 @@ void CSkypeProto::OnReceiveAvatar(const NETLIBHTTPREQUEST *response, void *arg)
setByte(hContact, "AvatarType", ai.format);
GetAvatarFileName(hContact, ai.filename, _countof(ai.filename));
- FILE *out = _tfopen(ai.filename, _T("wb"));
+ FILE *out = _tfopen(ai.filename, L"wb");
if (out == NULL) {
ProtoBroadcastAck(hContact, ACKTYPE_AVATAR, ACKRESULT_FAILED, &ai, 0);
return;
@@ -127,7 +127,7 @@ INT_PTR CSkypeProto::SvcGetMyAvatar(WPARAM wParam, LPARAM lParam)
void CSkypeProto::GetAvatarFileName(MCONTACT hContact, TCHAR* pszDest, size_t cbLen)
{
- int tPathLen = mir_sntprintf(pszDest, cbLen, _T("%s\\%s"), VARST(_T("%miranda_avatarcache%")), m_tszUserName);
+ int tPathLen = mir_sntprintf(pszDest, cbLen, L"%s\\%s", VARST(L"%miranda_avatarcache%"), m_tszUserName);
DWORD dwAttributes = GetFileAttributes(pszDest);
if (dwAttributes == 0xffffffff || (dwAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0)
@@ -139,7 +139,7 @@ void CSkypeProto::GetAvatarFileName(MCONTACT hContact, TCHAR* pszDest, size_t cb
CMStringA username(Contacts[hContact]);
username.Replace("live:", "__live_");
username.Replace("facebook:", "__facebook_");
- mir_sntprintf(pszDest + tPathLen, MAX_PATH - tPathLen, _T("%S%s"), username.c_str(), szFileType);
+ mir_sntprintf(pszDest + tPathLen, MAX_PATH - tPathLen, L"%S%s", username.c_str(), szFileType);
}
void CSkypeProto::SetAvatarUrl(MCONTACT hContact, CMString &tszUrl)
diff --git a/protocols/SkypeWeb/src/skype_chatrooms.cpp b/protocols/SkypeWeb/src/skype_chatrooms.cpp
index e7a47cf2d6..8fa95966d9 100644
--- a/protocols/SkypeWeb/src/skype_chatrooms.cpp
+++ b/protocols/SkypeWeb/src/skype_chatrooms.cpp
@@ -309,7 +309,7 @@ void CSkypeProto::OnChatEvent(const JSONNode &node)
ptrA xinitiator, xtarget, initiator;
//content = <addmember><eventtime>1429186229164</eventtime><initiator>8:initiator</initiator><target>8:user</target></addmember>
- HXML xml = xmlParseString(ptrT(mir_utf8decodeT(strContent.c_str())), 0, _T("addmember"));
+ HXML xml = xmlParseString(ptrT(mir_utf8decodeT(strContent.c_str())), 0, L"addmember");
if (xml == NULL)
return;
@@ -331,12 +331,12 @@ void CSkypeProto::OnChatEvent(const JSONNode &node)
ptrA xinitiator, xtarget;
//content = <addmember><eventtime>1429186229164</eventtime><initiator>8:initiator</initiator><target>8:user</target></addmember>
- HXML xml = xmlParseString(ptrT(mir_utf8decodeT(strContent.c_str())), 0, _T("deletemember"));
+ HXML xml = xmlParseString(ptrT(mir_utf8decodeT(strContent.c_str())), 0, L"deletemember");
if (xml != NULL) {
- HXML xmlNode = xmlGetChildByPath(xml, _T("initiator"), 0);
+ HXML xmlNode = xmlGetChildByPath(xml, L"initiator", 0);
xinitiator = node != NULL ? mir_t2a(xmlGetText(xmlNode)) : NULL;
- xmlNode = xmlGetChildByPath(xml, _T("target"), 0);
+ xmlNode = xmlGetChildByPath(xml, L"target", 0);
xtarget = xmlNode != NULL ? mir_t2a(xmlGetText(xmlNode)) : NULL;
xmlDestroyNode(xml);
@@ -353,12 +353,12 @@ void CSkypeProto::OnChatEvent(const JSONNode &node)
{
//content=<topicupdate><eventtime>1429532702130</eventtime><initiator>8:user</initiator><value>test topic</value></topicupdate>
ptrA xinitiator, value;
- HXML xml = xmlParseString(ptrT(mir_utf8decodeT(strContent.c_str())), 0, _T("topicupdate"));
+ HXML xml = xmlParseString(ptrT(mir_utf8decodeT(strContent.c_str())), 0, L"topicupdate");
if (xml != NULL) {
- HXML xmlNode = xmlGetChildByPath(xml, _T("initiator"), 0);
+ HXML xmlNode = xmlGetChildByPath(xml, L"initiator", 0);
xinitiator = xmlNode != NULL ? mir_t2a(xmlGetText(xmlNode)) : NULL;
- xmlNode = xmlGetChildByPath(xml, _T("value"), 0);
+ xmlNode = xmlGetChildByPath(xml, L"value", 0);
value = xmlNode != NULL ? mir_t2a(xmlGetText(xmlNode)) : NULL;
xmlDestroyNode(xml);
@@ -372,16 +372,16 @@ void CSkypeProto::OnChatEvent(const JSONNode &node)
{
//content=<roleupdate><eventtime>1429551258363</eventtime><initiator>8:user</initiator><target><id>8:user1</id><role>admin</role></target></roleupdate>
ptrA xinitiator, xId, xRole;
- HXML xml = xmlParseString(ptrT(mir_utf8decodeT(strContent.c_str())), 0, _T("roleupdate"));
+ HXML xml = xmlParseString(ptrT(mir_utf8decodeT(strContent.c_str())), 0, L"roleupdate");
if (xml != NULL) {
- HXML xmlNode = xmlGetChildByPath(xml, _T("initiator"), 0);
+ HXML xmlNode = xmlGetChildByPath(xml, L"initiator", 0);
xinitiator = xmlNode != NULL ? mir_t2a(xmlGetText(xmlNode)) : NULL;
- xmlNode = xmlGetChildByPath(xml, _T("target"), 0);
+ xmlNode = xmlGetChildByPath(xml, L"target", 0);
if (xmlNode != NULL)
{
- HXML xmlId = xmlGetChildByPath(xmlNode, _T("id"), 0);
- HXML xmlRole = xmlGetChildByPath(xmlNode, _T("role"), 0);
+ HXML xmlId = xmlGetChildByPath(xmlNode, L"id", 0);
+ HXML xmlRole = xmlGetChildByPath(xmlNode, L"role", 0);
xId = xmlId != NULL ? mir_t2a(xmlGetText(xmlId)) : NULL;
xRole = xmlRole != NULL ? mir_t2a(xmlGetText(xmlRole)) : NULL;
}
@@ -655,7 +655,7 @@ int CSkypeProto::OnGroupChatMenuHook(WPARAM, LPARAM lParam)
CMString CSkypeProto::ChangeTopicForm()
{
- CMString caption(FORMAT, _T("[%s] %s"), _A2T(m_szModuleName), TranslateT("Enter new chatroom topic"));
+ CMString caption(FORMAT, L"[%s] %s", _A2T(m_szModuleName), TranslateT("Enter new chatroom topic"));
ENTER_STRING pForm = { sizeof(pForm) };
pForm.type = ESF_MULTILINE;
pForm.caption = caption;
diff --git a/protocols/SkypeWeb/src/skype_db.h b/protocols/SkypeWeb/src/skype_db.h
index ac2d0906fc..63a38ecadc 100644
--- a/protocols/SkypeWeb/src/skype_db.h
+++ b/protocols/SkypeWeb/src/skype_db.h
@@ -52,12 +52,12 @@ struct CSkypeOptions
bAutoHistorySync(proto, "AutoSync", true),
bMarkAllAsUnread(proto, "MarkMesUnread", true),
- wstrPlace(proto, "Place", _T("")),
+ wstrPlace(proto, "Place", L""),
bUseHostnameAsPlace(proto, "UseHostName", true),
bUseBBCodes(proto, "UseBBCodes", true),
- wstrCListGroup(proto, SKYPE_SETTINGS_GROUP, _T("Skype"))
+ wstrCListGroup(proto, SKYPE_SETTINGS_GROUP, L"Skype")
{
}
diff --git a/protocols/SkypeWeb/src/skype_events.cpp b/protocols/SkypeWeb/src/skype_events.cpp
index 27a14309ee..f38ee7a8dd 100644
--- a/protocols/SkypeWeb/src/skype_events.cpp
+++ b/protocols/SkypeWeb/src/skype_events.cpp
@@ -57,19 +57,19 @@ INT_PTR CSkypeProto::GetEventText(WPARAM, LPARAM lParam)
case SKYPE_DB_EVENT_TYPE_CALL_INFO:
{
- HXML xml = xmlParseString(ptrT(mir_utf8decodeT((char*)pEvent->dbei->pBlob)), 0, _T("partlist"));
+ HXML xml = xmlParseString(ptrT(mir_utf8decodeT((char*)pEvent->dbei->pBlob)), 0, L"partlist");
if (xml != NULL)
{
- ptrA type(mir_t2a(xmlGetAttrValue(xml, _T("type"))));
+ ptrA type(mir_t2a(xmlGetAttrValue(xml, L"type")));
bool bType = (!mir_strcmpi(type, "started")) ? 1 : 0;
time_t callDuration = 0;
for (int i = 0; i < xmlGetChildCount(xml); i++)
{
- HXML xmlPart = xmlGetNthChild(xml, _T("part"), i);
+ HXML xmlPart = xmlGetNthChild(xml, L"part", i);
if (xmlPart != NULL)
{
- HXML xmlDuration = xmlGetChildByPath(xmlPart, _T("duration"), 0);
+ HXML xmlDuration = xmlGetChildByPath(xmlPart, L"duration", 0);
if (xmlDuration != NULL)
{
@@ -106,16 +106,16 @@ INT_PTR CSkypeProto::GetEventText(WPARAM, LPARAM lParam)
}
case SKYPE_DB_EVENT_TYPE_FILETRANSFER_INFO:
{
- HXML xml = xmlParseString(ptrT(mir_utf8decodeT((char*)pEvent->dbei->pBlob)), 0, _T("files"));
+ HXML xml = xmlParseString(ptrT(mir_utf8decodeT((char*)pEvent->dbei->pBlob)), 0, L"files");
if (xml != NULL)
{
for (int i = 0; i < xmlGetChildCount(xml); i++)
{
LONGLONG fileSize = 0;
- HXML xmlNode = xmlGetNthChild(xml, _T("file"), i);
+ HXML xmlNode = xmlGetNthChild(xml, L"file", i);
if (xmlNode != NULL)
{
- fileSize = _ttol(xmlGetAttrValue(xmlNode, _T("size")));
+ fileSize = _ttol(xmlGetAttrValue(xmlNode, L"size"));
char *fileName = _T2A(xmlGetText(xmlNode));
if (fileName != NULL)
{
@@ -136,14 +136,14 @@ INT_PTR CSkypeProto::GetEventText(WPARAM, LPARAM lParam)
case SKYPE_DB_EVENT_TYPE_MOJI:
case SKYPE_DB_EVENT_TYPE_URIOBJ:
{
- HXML xml = xmlParseString(ptrT(mir_utf8decodeT((char*)pEvent->dbei->pBlob)), 0, _T("URIObject"));
+ HXML xml = xmlParseString(ptrT(mir_utf8decodeT((char*)pEvent->dbei->pBlob)), 0, L"URIObject");
if (xml != NULL)
{
//szText.Append(_T2A(xmlGetText(xml)));
- HXML xmlA = xmlGetChildByPath(xml, _T("a"), 0);
+ HXML xmlA = xmlGetChildByPath(xml, L"a", 0);
if (xmlA != NULL)
{
- szText += T2Utf(xmlGetAttrValue(xmlA, _T("href")));
+ szText += T2Utf(xmlGetAttrValue(xmlA, L"href"));
}
xmlDestroyNode(xml);
}
diff --git a/protocols/SkypeWeb/src/skype_files.cpp b/protocols/SkypeWeb/src/skype_files.cpp
index 66b107a81e..bc562a8746 100644
--- a/protocols/SkypeWeb/src/skype_files.cpp
+++ b/protocols/SkypeWeb/src/skype_files.cpp
@@ -38,7 +38,7 @@ void CSkypeProto::OnASMObjectCreated(const NETLIBHTTPREQUEST *response, void *ar
JSONNode node = JSONNode::parse((char*)response->pData);
std::string strObjectId = node["id"].as_string();
fup->uid = mir_strdup(strObjectId.c_str());
- FILE *pFile = _tfopen(fup->tszFileName, _T("rb"));
+ FILE *pFile = _tfopen(fup->tszFileName, L"rb");
if (pFile == NULL) return;
fseek(pFile, 0, SEEK_END);
diff --git a/protocols/SkypeWeb/src/skype_login.cpp b/protocols/SkypeWeb/src/skype_login.cpp
index 594d83409b..7909698b37 100644
--- a/protocols/SkypeWeb/src/skype_login.cpp
+++ b/protocols/SkypeWeb/src/skype_login.cpp
@@ -77,25 +77,25 @@ void CSkypeProto::OnLoginOAuth(const NETLIBHTTPREQUEST *response)
{
case 40002:
{
- ShowNotification(_T("Skype"), TranslateT("Authentication failed. Invalid username."), NULL, 1);
+ ShowNotification(L"Skype", TranslateT("Authentication failed. Invalid username."), NULL, 1);
error = LOGINERR_BADUSERID;
break;
}
case 40120:
{
- ShowNotification(_T("Skype"), TranslateT("Authentication failed. Bad username or password."), NULL, 1);
+ ShowNotification(L"Skype", TranslateT("Authentication failed. Bad username or password."), NULL, 1);
error = LOGINERR_WRONGPASSWORD;
break;
}
case 40121:
{
- ShowNotification(_T("Skype"), TranslateT("Too many failed authentication attempts with given username or IP."), NULL, 1);
+ ShowNotification(L"Skype", TranslateT("Too many failed authentication attempts with given username or IP."), NULL, 1);
error = LOGIN_ERROR_TOOMANY_REQUESTS;
break;
}
default:
{
- ShowNotification(_T("Skype"), status["text"] ? status["text"].as_mstring() : TranslateT("Authentication failed. Unknown error."), NULL, 1);
+ ShowNotification(L"Skype", status["text"] ? status["text"].as_mstring() : TranslateT("Authentication failed. Unknown error."), NULL, 1);
error = LOGIN_ERROR_UNKNOWN;
}
}
diff --git a/protocols/SkypeWeb/src/skype_messages.cpp b/protocols/SkypeWeb/src/skype_messages.cpp
index 898bc1f11a..cc9ac8e2ca 100644
--- a/protocols/SkypeWeb/src/skype_messages.cpp
+++ b/protocols/SkypeWeb/src/skype_messages.cpp
@@ -275,7 +275,7 @@ void CSkypeProto::MarkMessagesRead(MCONTACT hContact, MEVENT hDbEvent)
void CSkypeProto::ProcessContactRecv(MCONTACT hContact, time_t timestamp, const char *szContent, const char *szMessageId)
{
- HXML xmlNode = xmlParseString(mir_utf8decodeT(szContent), 0, _T("contacts"));
+ HXML xmlNode = xmlParseString(mir_utf8decodeT(szContent), 0, L"contacts");
if (xmlNode)
{
int nCount = 0;
@@ -287,7 +287,7 @@ void CSkypeProto::ProcessContactRecv(MCONTACT hContact, time_t timestamp, const
nCount = 0;
for (int i = 0; i < xmlGetChildCount(xmlNode); i++)
{
- HXML xmlContact = xmlGetNthChild(xmlNode, _T("c"), i);
+ HXML xmlContact = xmlGetNthChild(xmlNode, L"c", i);
if (xmlContact != NULL)
{
const TCHAR *tszContactId = xmlGetAttrValue(xmlContact, L"s");
diff --git a/protocols/SkypeWeb/src/skype_mslogin.cpp b/protocols/SkypeWeb/src/skype_mslogin.cpp
index 9301632c70..3992ab48b7 100644
--- a/protocols/SkypeWeb/src/skype_mslogin.cpp
+++ b/protocols/SkypeWeb/src/skype_mslogin.cpp
@@ -176,7 +176,7 @@ void CSkypeProto::OnMSLoginEnd(const NETLIBHTTPREQUEST *response)
CMString CSkypeProto::RunConfirmationCode()
{
- CMString caption(FORMAT, _T("[%s] %s"), _A2T(m_szModuleName), TranslateT("Enter confirmation code"));
+ CMString caption(FORMAT, L"[%s] %s", _A2T(m_szModuleName), TranslateT("Enter confirmation code"));
ENTER_STRING pForm = { sizeof(pForm) };
pForm.type = ESF_PASSWORD;
pForm.caption = caption;
diff --git a/protocols/SkypeWeb/src/skype_popups.cpp b/protocols/SkypeWeb/src/skype_popups.cpp
index 0ca5aab40b..49a7b40d60 100644
--- a/protocols/SkypeWeb/src/skype_popups.cpp
+++ b/protocols/SkypeWeb/src/skype_popups.cpp
@@ -7,7 +7,7 @@ void CSkypeProto::InitPopups()
POPUPCLASS ppc = { sizeof(ppc) };
ppc.flags = PCF_TCHAR;
- mir_sntprintf(desc, _T("%s %s"), m_tszUserName, TranslateT("Notifications"));
+ mir_sntprintf(desc, L"%s %s", m_tszUserName, TranslateT("Notifications"));
mir_snprintf(name, "%s_%s", m_szModuleName, "Notification");
ppc.ptszDescription = desc;
ppc.pszName = name;
@@ -17,7 +17,7 @@ void CSkypeProto::InitPopups()
ppc.iSeconds = 5;
m_PopupClasses.insert(Popup_RegisterClass(&ppc));
- mir_sntprintf(desc, _T("%s %s"), m_tszUserName, TranslateT("Errors"));
+ mir_sntprintf(desc, L"%s %s", m_tszUserName, TranslateT("Errors"));
mir_snprintf(name, "%s_%s", m_szModuleName, "Error");
ppc.ptszDescription = desc;
ppc.pszName = name;
@@ -27,7 +27,7 @@ void CSkypeProto::InitPopups()
ppc.iSeconds = -1;
m_PopupClasses.insert(Popup_RegisterClass(&ppc));
- mir_sntprintf(desc, _T("%s %s"), m_tszUserName, TranslateT("Calls"));
+ mir_sntprintf(desc, L"%s %s", m_tszUserName, TranslateT("Calls"));
mir_snprintf(name, "%s_%s", m_szModuleName, "Call");
ppc.ptszDescription = desc;
ppc.pszName = name;
diff --git a/protocols/SkypeWeb/src/skype_profile.cpp b/protocols/SkypeWeb/src/skype_profile.cpp
index a7f5d33608..fff14b059f 100644
--- a/protocols/SkypeWeb/src/skype_profile.cpp
+++ b/protocols/SkypeWeb/src/skype_profile.cpp
@@ -22,225 +22,225 @@ std::map<std::tstring, std::tstring> CSkypeProto::languages;
void CSkypeProto::InitLanguages()
{
std::map<std::tstring, std::tstring> result;
- result[_T("ab")] = _T("Abkhazian");
- result[_T("aa")] = _T("Afar");
- result[_T("af")] = _T("Afrikaans");
- result[_T("ak")] = _T("Akan");
- result[_T("sq")] = _T("Albanian");
- result[_T("am")] = _T("Amharic");
- result[_T("ar")] = _T("Arabic");
- result[_T("an")] = _T("Aragonese");
- result[_T("hy")] = _T("Armenian");
- result[_T("as")] = _T("Assamese");
- result[_T("av")] = _T("Avaric");
- result[_T("ae")] = _T("Avestan");
- result[_T("ay")] = _T("Aymara");
- result[_T("az")] = _T("Azerbaijani");
- result[_T("bm")] = _T("Bambara");
- result[_T("ba")] = _T("Bashkir");
- result[_T("eu")] = _T("Basque");
- result[_T("be")] = _T("Belarusian");
- result[_T("bn")] = _T("Bengali");
- result[_T("bh")] = _T("Bihari languages");
- result[_T("bi")] = _T("Bislama");
- result[_T("nb")] = _T("Bokmal, Norwegian");
- result[_T("bs")] = _T("Bosnian");
- result[_T("br")] = _T("Breton");
- result[_T("bg")] = _T("Bulgarian");
- result[_T("my")] = _T("Burmese");
- result[_T("es")] = _T("Castilian");
- result[_T("ca")] = _T("Catalan");
- result[_T("km")] = _T("Central Khmer");
- result[_T("ch")] = _T("Chamorro");
- result[_T("ce")] = _T("Chechen");
- result[_T("ny")] = _T("Chewa");
- result[_T("ny")] = _T("Chichewa");
- result[_T("zh")] = _T("Chinese");
- result[_T("za")] = _T("Chuang");
- result[_T("cu")] = _T("Church Slavic");
- result[_T("cu")] = _T("Church Slavonic");
- result[_T("cv")] = _T("Chuvash");
- result[_T("kw")] = _T("Cornish");
- result[_T("co")] = _T("Corsican");
- result[_T("cr")] = _T("Cree");
- result[_T("hr")] = _T("Croatian");
- result[_T("cs")] = _T("Czech");
- result[_T("da")] = _T("Danish");
- result[_T("dv")] = _T("Dhivehi");
- result[_T("dv")] = _T("Divehi");
- result[_T("nl")] = _T("Dutch");
- result[_T("dz")] = _T("Dzongkha");
- result[_T("en")] = _T("English");
- result[_T("eo")] = _T("Esperanto");
- result[_T("et")] = _T("Estonian");
- result[_T("ee")] = _T("Ewe");
- result[_T("fo")] = _T("Faroese");
- result[_T("fj")] = _T("Fijian");
- result[_T("fi")] = _T("Finnish");
- result[_T("nl")] = _T("Flemish");
- result[_T("fr")] = _T("French");
- result[_T("ff")] = _T("Fulah");
- result[_T("gd")] = _T("Gaelic");
- result[_T("gl")] = _T("Galician");
- result[_T("lg")] = _T("Ganda");
- result[_T("ka")] = _T("Georgian");
- result[_T("de")] = _T("German");
- result[_T("ki")] = _T("Gikuyu");
- result[_T("el")] = _T("Greek, Modern (1453-)");
- result[_T("kl")] = _T("Greenlandic");
- result[_T("gn")] = _T("Guarani");
- result[_T("gu")] = _T("Gujarati");
- result[_T("ht")] = _T("Haitian");
- result[_T("ht")] = _T("Haitian Creole");
- result[_T("ha")] = _T("Hausa");
- result[_T("he")] = _T("Hebrew");
- result[_T("hz")] = _T("Herero");
- result[_T("hi")] = _T("Hindi");
- result[_T("ho")] = _T("Hiri Motu");
- result[_T("hu")] = _T("Hungarian");
- result[_T("is")] = _T("Icelandic");
- result[_T("io")] = _T("Ido");
- result[_T("ig")] = _T("Igbo");
- result[_T("id")] = _T("Indonesian");
- result[_T("ia")] = _T("Interlingua (International Auxiliary Language Association)");
- result[_T("ie")] = _T("Interlingue");
- result[_T("iu")] = _T("Inuktitut");
- result[_T("ik")] = _T("Inupiaq");
- result[_T("ga")] = _T("Irish");
- result[_T("it")] = _T("Italian");
- result[_T("ja")] = _T("Japanese");
- result[_T("jv")] = _T("Javanese");
- result[_T("kl")] = _T("Kalaallisut");
- result[_T("kn")] = _T("Kannada");
- result[_T("kr")] = _T("Kanuri");
- result[_T("ks")] = _T("Kashmiri");
- result[_T("kk")] = _T("Kazakh");
- result[_T("ki")] = _T("Kikuyu");
- result[_T("rw")] = _T("Kinyarwanda");
- result[_T("ky")] = _T("Kirghiz");
- result[_T("kv")] = _T("Komi");
- result[_T("kg")] = _T("Kongo");
- result[_T("ko")] = _T("Korean");
- result[_T("kj")] = _T("Kuanyama");
- result[_T("ku")] = _T("Kurdish");
- result[_T("kj")] = _T("Kwanyama");
- result[_T("ky")] = _T("Kyrgyz");
- result[_T("lo")] = _T("Lao");
- result[_T("la")] = _T("Latin");
- result[_T("lv")] = _T("Latvian");
- result[_T("lb")] = _T("Letzeburgesch");
- result[_T("li")] = _T("Limburgan");
- result[_T("li")] = _T("Limburger");
- result[_T("li")] = _T("Limburgish");
- result[_T("ln")] = _T("Lingala");
- result[_T("lt")] = _T("Lithuanian");
- result[_T("lu")] = _T("Luba-Katanga");
- result[_T("lb")] = _T("Luxembourgish");
- result[_T("mk")] = _T("Macedonian");
- result[_T("mg")] = _T("Malagasy");
- result[_T("ms")] = _T("Malay");
- result[_T("ml")] = _T("Malayalam");
- result[_T("dv")] = _T("Maldivian");
- result[_T("mt")] = _T("Maltese");
- result[_T("gv")] = _T("Manx");
- result[_T("mi")] = _T("Maori");
- result[_T("mr")] = _T("Marathi");
- result[_T("mh")] = _T("Marshallese");
- result[_T("ro")] = _T("Moldavian");
- result[_T("ro")] = _T("Moldovan");
- result[_T("mn")] = _T("Mongolian");
- result[_T("na")] = _T("Nauru");
- result[_T("nv")] = _T("Navaho");
- result[_T("nv")] = _T("Navajo");
- result[_T("nd")] = _T("Ndebele, North");
- result[_T("nr")] = _T("Ndebele, South");
- result[_T("ng")] = _T("Ndonga");
- result[_T("ne")] = _T("Nepali");
- result[_T("nd")] = _T("North Ndebele");
- result[_T("se")] = _T("Northern Sami");
- result[_T("no")] = _T("Norwegian");
- result[_T("nb")] = _T("Norwegian Bokmal");
- result[_T("nn")] = _T("Norwegian Nynorsk");
- result[_T("ii")] = _T("Nuosu");
- result[_T("ny")] = _T("Nyanja");
- result[_T("nn")] = _T("Nynorsk, Norwegian");
- result[_T("ie")] = _T("Occidental");
- result[_T("oc")] = _T("Occitan (post 1500)");
- result[_T("oj")] = _T("Ojibwa");
- result[_T("cu")] = _T("Old Bulgarian");
- result[_T("cu")] = _T("Old Church Slavonic");
- result[_T("cu")] = _T("Old Slavonic");
- result[_T("or")] = _T("Oriya");
- result[_T("om")] = _T("Oromo");
- result[_T("os")] = _T("Ossetian");
- result[_T("os")] = _T("Ossetic");
- result[_T("pi")] = _T("Pali");
- result[_T("pa")] = _T("Panjabi");
- result[_T("ps")] = _T("Pashto");
- result[_T("fa")] = _T("Persian");
- result[_T("pl")] = _T("Polish");
- result[_T("pt")] = _T("Portuguese");
- result[_T("pa")] = _T("Punjabi");
- result[_T("ps")] = _T("Pushto");
- result[_T("qu")] = _T("Quechua");
- result[_T("ro")] = _T("Romanian");
- result[_T("rm")] = _T("Romansh");
- result[_T("rn")] = _T("Rundi");
- result[_T("ru")] = _T("Russian");
- result[_T("sm")] = _T("Samoan");
- result[_T("sg")] = _T("Sango");
- result[_T("sa")] = _T("Sanskrit");
- result[_T("sc")] = _T("Sardinian");
- result[_T("gd")] = _T("Scottish Gaelic");
- result[_T("sr")] = _T("Serbian");
- result[_T("sn")] = _T("Shona");
- result[_T("ii")] = _T("Sichuan Yi");
- result[_T("sd")] = _T("Sindhi");
- result[_T("si")] = _T("Sinhala");
- result[_T("si")] = _T("Sinhalese");
- result[_T("sk")] = _T("Slovak");
- result[_T("sl")] = _T("Slovenian");
- result[_T("so")] = _T("Somali");
- result[_T("st")] = _T("Sotho, Southern");
- result[_T("nr")] = _T("South Ndebele");
- result[_T("es")] = _T("Spanish");
- result[_T("su")] = _T("Sundanese");
- result[_T("sw")] = _T("Swahili");
- result[_T("ss")] = _T("Swati");
- result[_T("sv")] = _T("Swedish");
- result[_T("tl")] = _T("Tagalog");
- result[_T("ty")] = _T("Tahitian");
- result[_T("tg")] = _T("Tajik");
- result[_T("ta")] = _T("Tamil");
- result[_T("tt")] = _T("Tatar");
- result[_T("te")] = _T("Telugu");
- result[_T("th")] = _T("Thai");
- result[_T("bo")] = _T("Tibetan");
- result[_T("ti")] = _T("Tigrinya");
- result[_T("to")] = _T("Tonga (Tonga Islands)");
- result[_T("ts")] = _T("Tsonga");
- result[_T("tn")] = _T("Tswana");
- result[_T("tr")] = _T("Turkish");
- result[_T("tk")] = _T("Turkmen");
- result[_T("tw")] = _T("Twi");
- result[_T("ug")] = _T("Uighur");
- result[_T("uk")] = _T("Ukrainian");
- result[_T("ur")] = _T("Urdu");
- result[_T("ug")] = _T("Uyghur");
- result[_T("uz")] = _T("Uzbek");
- result[_T("ca")] = _T("Valencian");
- result[_T("ve")] = _T("Venda");
- result[_T("vi")] = _T("Vietnamese");
- result[_T("vo")] = _T("Volapuk");
- result[_T("wa")] = _T("Walloon");
- result[_T("cy")] = _T("Welsh");
- result[_T("fy")] = _T("Western Frisian");
- result[_T("wo")] = _T("Wolof");
- result[_T("xh")] = _T("Xhosa");
- result[_T("yi")] = _T("Yiddish");
- result[_T("yo")] = _T("Yoruba");
- result[_T("za")] = _T("Zhuang");
- result[_T("zu")] = _T("Zulu");
+ result[L"ab"] = L"Abkhazian";
+ result[L"aa"] = L"Afar";
+ result[L"af"] = L"Afrikaans";
+ result[L"ak"] = L"Akan";
+ result[L"sq"] = L"Albanian";
+ result[L"am"] = L"Amharic";
+ result[L"ar"] = L"Arabic";
+ result[L"an"] = L"Aragonese";
+ result[L"hy"] = L"Armenian";
+ result[L"as"] = L"Assamese";
+ result[L"av"] = L"Avaric";
+ result[L"ae"] = L"Avestan";
+ result[L"ay"] = L"Aymara";
+ result[L"az"] = L"Azerbaijani";
+ result[L"bm"] = L"Bambara";
+ result[L"ba"] = L"Bashkir";
+ result[L"eu"] = L"Basque";
+ result[L"be"] = L"Belarusian";
+ result[L"bn"] = L"Bengali";
+ result[L"bh"] = L"Bihari languages";
+ result[L"bi"] = L"Bislama";
+ result[L"nb"] = L"Bokmal, Norwegian";
+ result[L"bs"] = L"Bosnian";
+ result[L"br"] = L"Breton";
+ result[L"bg"] = L"Bulgarian";
+ result[L"my"] = L"Burmese";
+ result[L"es"] = L"Castilian";
+ result[L"ca"] = L"Catalan";
+ 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";
+ result[L"cu"] = L"Church Slavic";
+ result[L"cu"] = L"Church Slavonic";
+ result[L"cv"] = L"Chuvash";
+ result[L"kw"] = L"Cornish";
+ result[L"co"] = L"Corsican";
+ result[L"cr"] = L"Cree";
+ 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";
+ result[L"en"] = L"English";
+ result[L"eo"] = L"Esperanto";
+ result[L"et"] = L"Estonian";
+ result[L"ee"] = L"Ewe";
+ result[L"fo"] = L"Faroese";
+ result[L"fj"] = L"Fijian";
+ result[L"fi"] = L"Finnish";
+ result[L"nl"] = L"Flemish";
+ result[L"fr"] = L"French";
+ result[L"ff"] = L"Fulah";
+ result[L"gd"] = L"Gaelic";
+ result[L"gl"] = L"Galician";
+ result[L"lg"] = L"Ganda";
+ result[L"ka"] = L"Georgian";
+ result[L"de"] = L"German";
+ result[L"ki"] = L"Gikuyu";
+ result[L"el"] = L"Greek, Modern (1453-)";
+ 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";
+ result[L"hz"] = L"Herero";
+ result[L"hi"] = L"Hindi";
+ result[L"ho"] = L"Hiri Motu";
+ result[L"hu"] = L"Hungarian";
+ result[L"is"] = L"Icelandic";
+ result[L"io"] = L"Ido";
+ result[L"ig"] = L"Igbo";
+ result[L"id"] = L"Indonesian";
+ result[L"ia"] = L"Interlingua (International Auxiliary Language Association)";
+ result[L"ie"] = L"Interlingue";
+ result[L"iu"] = L"Inuktitut";
+ result[L"ik"] = L"Inupiaq";
+ result[L"ga"] = L"Irish";
+ result[L"it"] = L"Italian";
+ result[L"ja"] = L"Japanese";
+ result[L"jv"] = L"Javanese";
+ result[L"kl"] = L"Kalaallisut";
+ result[L"kn"] = L"Kannada";
+ result[L"kr"] = L"Kanuri";
+ result[L"ks"] = L"Kashmiri";
+ result[L"kk"] = L"Kazakh";
+ result[L"ki"] = L"Kikuyu";
+ result[L"rw"] = L"Kinyarwanda";
+ result[L"ky"] = L"Kirghiz";
+ result[L"kv"] = L"Komi";
+ result[L"kg"] = L"Kongo";
+ result[L"ko"] = L"Korean";
+ result[L"kj"] = L"Kuanyama";
+ result[L"ku"] = L"Kurdish";
+ result[L"kj"] = L"Kwanyama";
+ result[L"ky"] = L"Kyrgyz";
+ result[L"lo"] = L"Lao";
+ result[L"la"] = L"Latin";
+ result[L"lv"] = L"Latvian";
+ result[L"lb"] = L"Letzeburgesch";
+ result[L"li"] = L"Limburgan";
+ result[L"li"] = L"Limburger";
+ result[L"li"] = L"Limburgish";
+ result[L"ln"] = L"Lingala";
+ result[L"lt"] = L"Lithuanian";
+ result[L"lu"] = L"Luba-Katanga";
+ result[L"lb"] = L"Luxembourgish";
+ result[L"mk"] = L"Macedonian";
+ result[L"mg"] = L"Malagasy";
+ result[L"ms"] = L"Malay";
+ result[L"ml"] = L"Malayalam";
+ result[L"dv"] = L"Maldivian";
+ result[L"mt"] = L"Maltese";
+ result[L"gv"] = L"Manx";
+ 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";
+ result[L"ng"] = L"Ndonga";
+ result[L"ne"] = L"Nepali";
+ result[L"nd"] = L"North Ndebele";
+ result[L"se"] = L"Northern Sami";
+ result[L"no"] = L"Norwegian";
+ result[L"nb"] = L"Norwegian Bokmal";
+ result[L"nn"] = L"Norwegian Nynorsk";
+ result[L"ii"] = L"Nuosu";
+ result[L"ny"] = L"Nyanja";
+ result[L"nn"] = L"Nynorsk, Norwegian";
+ result[L"ie"] = L"Occidental";
+ result[L"oc"] = L"Occitan (post 1500)";
+ result[L"oj"] = L"Ojibwa";
+ result[L"cu"] = L"Old Bulgarian";
+ result[L"cu"] = L"Old Church Slavonic";
+ 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";
+ result[L"ps"] = L"Pashto";
+ result[L"fa"] = L"Persian";
+ result[L"pl"] = L"Polish";
+ result[L"pt"] = L"Portuguese";
+ result[L"pa"] = L"Punjabi";
+ result[L"ps"] = L"Pushto";
+ result[L"qu"] = L"Quechua";
+ result[L"ro"] = L"Romanian";
+ result[L"rm"] = L"Romansh";
+ result[L"rn"] = L"Rundi";
+ result[L"ru"] = L"Russian";
+ result[L"sm"] = L"Samoan";
+ result[L"sg"] = L"Sango";
+ result[L"sa"] = L"Sanskrit";
+ result[L"sc"] = L"Sardinian";
+ result[L"gd"] = L"Scottish Gaelic";
+ result[L"sr"] = L"Serbian";
+ 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";
+ result[L"so"] = L"Somali";
+ result[L"st"] = L"Sotho, Southern";
+ result[L"nr"] = L"South Ndebele";
+ result[L"es"] = L"Spanish";
+ result[L"su"] = L"Sundanese";
+ result[L"sw"] = L"Swahili";
+ result[L"ss"] = L"Swati";
+ result[L"sv"] = L"Swedish";
+ result[L"tl"] = L"Tagalog";
+ result[L"ty"] = L"Tahitian";
+ result[L"tg"] = L"Tajik";
+ result[L"ta"] = L"Tamil";
+ result[L"tt"] = L"Tatar";
+ result[L"te"] = L"Telugu";
+ result[L"th"] = L"Thai";
+ result[L"bo"] = L"Tibetan";
+ result[L"ti"] = L"Tigrinya";
+ result[L"to"] = L"Tonga (Tonga Islands)";
+ result[L"ts"] = L"Tsonga";
+ result[L"tn"] = L"Tswana";
+ result[L"tr"] = L"Turkish";
+ result[L"tk"] = L"Turkmen";
+ result[L"tw"] = L"Twi";
+ result[L"ug"] = L"Uighur";
+ result[L"uk"] = L"Ukrainian";
+ result[L"ur"] = L"Urdu";
+ result[L"ug"] = L"Uyghur";
+ result[L"uz"] = L"Uzbek";
+ result[L"ca"] = L"Valencian";
+ result[L"ve"] = L"Venda";
+ result[L"vi"] = L"Vietnamese";
+ result[L"vo"] = L"Volapuk";
+ result[L"wa"] = L"Walloon";
+ result[L"cy"] = L"Welsh";
+ result[L"fy"] = L"Western Frisian";
+ result[L"wo"] = L"Wolof";
+ result[L"xh"] = L"Xhosa";
+ result[L"yi"] = L"Yiddish";
+ result[L"yo"] = L"Yoruba";
+ result[L"za"] = L"Zhuang";
+ result[L"zu"] = L"Zulu";
}
void CSkypeProto::UpdateProfileFirstName(const JSONNode &root, MCONTACT hContact)
@@ -268,7 +268,7 @@ void CSkypeProto::UpdateProfileDisplayName(const JSONNode &root, MCONTACT hConta
if (firstname) {
CMString nick(firstname);
if (lastname)
- nick.AppendFormat(_T(" %s"), lastname);
+ nick.AppendFormat(L" %s", lastname);
setTString(hContact, "Nick", nick);
}
else if (lastname)
@@ -299,7 +299,7 @@ void CSkypeProto::UpdateProfileBirthday(const JSONNode &root, MCONTACT hContact)
if (!birthday.IsEmpty() && birthday != "null")
{
int d, m, y;
- _stscanf(birthday.GetBuffer(), _T("%d-%d-%d"), &y, &m, &d);
+ _stscanf(birthday.GetBuffer(), L"%d-%d-%d", &y, &m, &d);
setWord(hContact, "BirthYear", y);
setByte(hContact, "BirthDay", d);
setByte(hContact, "BirthMonth", m);
diff --git a/protocols/SkypeWeb/src/skype_proto.cpp b/protocols/SkypeWeb/src/skype_proto.cpp
index 0059de176b..a4ff764aef 100644
--- a/protocols/SkypeWeb/src/skype_proto.cpp
+++ b/protocols/SkypeWeb/src/skype_proto.cpp
@@ -42,7 +42,7 @@ CSkypeProto::CSkypeProto(const char* protoName, const TCHAR* userName) :
CreateProtoService("/IncomingCallCLE", &CSkypeProto::OnIncomingCallCLE);
CreateProtoService("/IncomingCallPP", &CSkypeProto::OnIncomingCallPP);
- m_tszAvatarFolder = std::tstring(VARST(_T("%miranda_avatarcache%"))) + _T("\\") + m_tszUserName;
+ m_tszAvatarFolder = std::tstring(VARST(L"%miranda_avatarcache%")) + L"\\" + m_tszUserName;
DWORD dwAttributes = GetFileAttributes(m_tszAvatarFolder.c_str());
if (dwAttributes == 0xffffffff || (dwAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0)
CreateDirectoryTreeT(m_tszAvatarFolder.c_str());
diff --git a/protocols/SkypeWeb/src/skype_utils.cpp b/protocols/SkypeWeb/src/skype_utils.cpp
index fa3abdeb3b..58d0ad84e4 100644
--- a/protocols/SkypeWeb/src/skype_utils.cpp
+++ b/protocols/SkypeWeb/src/skype_utils.cpp
@@ -507,11 +507,11 @@ INT_PTR CSkypeProto::ParseSkypeUriService(WPARAM, LPARAM lParam)
*(szSecondParam++) = 0;
// no command or message command
- if (!szCommand || (szCommand && !mir_tstrcmpi(szCommand, _T("chat"))))
+ if (!szCommand || (szCommand && !mir_tstrcmpi(szCommand, L"chat")))
{
if (szSecondParam)
{
- TCHAR *szChatId = _tcsstr(szSecondParam, _T("id="));
+ TCHAR *szChatId = _tcsstr(szSecondParam, L"id=");
if (szChatId)
{
szChatId += 5;
@@ -523,14 +523,14 @@ INT_PTR CSkypeProto::ParseSkypeUriService(WPARAM, LPARAM lParam)
CallService(MS_MSG_SENDMESSAGE, (WPARAM)hContact, NULL);
return 0;
}
- else if (!mir_tstrcmpi(szCommand, _T("call")))
+ else if (!mir_tstrcmpi(szCommand, L"call"))
{
MCONTACT hContact = AddContact(_T2A(szJid), true);
NotifyEventHooks(g_hCallEvent, (WPARAM)hContact, (LPARAM)0);
return 0;
}
- else if (!mir_tstrcmpi(szCommand, _T("userinfo"))){ return 0; }
- else if (!mir_tstrcmpi(szCommand, _T("add")))
+ else if (!mir_tstrcmpi(szCommand, L"userinfo")){ return 0; }
+ else if (!mir_tstrcmpi(szCommand, L"add"))
{
MCONTACT hContact = FindContact(_T2A(szJid));
if (hContact == NULL)
@@ -550,13 +550,13 @@ INT_PTR CSkypeProto::ParseSkypeUriService(WPARAM, LPARAM lParam)
}
return 0;
}
- if (!mir_tstrcmpi(szCommand, _T("sendfile")))
+ if (!mir_tstrcmpi(szCommand, L"sendfile"))
{
MCONTACT hContact = AddContact(_T2A(szJid), true);
CallService(MS_FILE_SENDFILE, hContact, NULL);
return 1;
}
- if (!mir_tstrcmpi(szCommand, _T("voicemail")))
+ if (!mir_tstrcmpi(szCommand, L"voicemail"))
{
return 1;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 15:27:10 +0000