From d4b6f40bf87b904f4f5bfe3d8e3862e57a66d897 Mon Sep 17 00:00:00 2001 From: MikalaiR Date: Mon, 13 Jul 2015 19:55:54 +0000 Subject: SkypeWeb: More fixes. git-svn-id: http://svn.miranda-ng.org/main/trunk@14554 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/SkypeWeb/src/skype_db.cpp | 2 +- protocols/SkypeWeb/src/skype_events.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'protocols') diff --git a/protocols/SkypeWeb/src/skype_db.cpp b/protocols/SkypeWeb/src/skype_db.cpp index eead114f49..394f0f552e 100644 --- a/protocols/SkypeWeb/src/skype_db.cpp +++ b/protocols/SkypeWeb/src/skype_db.cpp @@ -38,7 +38,7 @@ MEVENT CSkypeProto::GetMessageFromDb(MCONTACT hContact, const char *messageId, L dbei.pBlob = blob; db_event_get(hDbEvent, &dbei); - if (dbei.eventType != EVENTTYPE_MESSAGE && dbei.eventType != SKYPE_DB_EVENT_TYPE_ACTION && dbei.eventType != SKYPE_DB_EVENT_TYPE_CALL_INFO) + if (dbei.eventType != EVENTTYPE_MESSAGE && dbei.eventType != SKYPE_DB_EVENT_TYPE_ACTION && dbei.eventType != SKYPE_DB_EVENT_TYPE_CALL_INFO && dbei.eventType != SKYPE_DB_EVENT_TYPE_FILETRANSFER_INFO && dbei.eventType != SKYPE_DB_EVENT_TYPE_URIOBJ) continue; size_t cbLen = mir_strlen((char*)dbei.pBlob); diff --git a/protocols/SkypeWeb/src/skype_events.cpp b/protocols/SkypeWeb/src/skype_events.cpp index 64cf955faf..6a15a6a553 100644 --- a/protocols/SkypeWeb/src/skype_events.cpp +++ b/protocols/SkypeWeb/src/skype_events.cpp @@ -44,7 +44,7 @@ INT_PTR CSkypeProto::GetCallEventText(WPARAM, LPARAM lParam) HXML xmlName = xmlGetChildByPath(xmlPart, _T("name"), 0); if (xmlName != NULL) { - text.AppendFormat(Translate("%s %s this call. \n"), mir_t2a(xmlGetText(xmlName)), bType ? Translate("enter") : Translate("left")); + text.AppendFormat(Translate("%s %s this call. \n"), _T2A(xmlGetText(xmlName)), bType ? Translate("enter") : Translate("left")); xmlDestroyNode(xmlName); } xmlDestroyNode(xmlPart); @@ -68,7 +68,7 @@ INT_PTR CSkypeProto::GetCallEventText(WPARAM, LPARAM lParam) if (xmlNode != NULL) { fileSize = _ttoi(ptrT((TCHAR*)xmlGetAttrValue(xmlNode, _T("size")))); - ptrA fileName(mir_utf8encodeT(xmlGetText(xmlNode))); + ptrA fileName(mir_utf8encodeT(ptrT((TCHAR*)xmlGetText(xmlNode)))); if (fileName != NULL) { CMStringA msg(FORMAT, "%s:\n\t%s: %s\n\t%s: %d %s", Translate("File transfer"), Translate("File name"), fileName, Translate("Size"), fileSize, Translate("bytes")); @@ -89,7 +89,7 @@ INT_PTR CSkypeProto::GetCallEventText(WPARAM, LPARAM lParam) HXML xml = xmlParseString(ptrT(mir_utf8decodeT((char*)pEvent->dbei->pBlob)), 0, _T("URIObject")); if (xml != NULL) { - text.Append(mir_t2a(xmlGetText(xml))); + text.Append(_T2A(xmlGetText(xml))); xmlDestroyNode(xml); } pszText = mir_strdup(text.GetBuffer()); -- cgit v1.2.3