diff options
Diffstat (limited to 'protocols')
| -rw-r--r-- | protocols/Skype/src/skype_account.cpp | 2 | ||||
| -rw-r--r-- | protocols/Skype/src/skype_chat.cpp | 14 | ||||
| -rw-r--r-- | protocols/Skype/src/skype_messages.cpp | 2 |
3 files changed, 8 insertions, 10 deletions
diff --git a/protocols/Skype/src/skype_account.cpp b/protocols/Skype/src/skype_account.cpp index a7a9401191..d62613e1d1 100644 --- a/protocols/Skype/src/skype_account.cpp +++ b/protocols/Skype/src/skype_account.cpp @@ -107,7 +107,7 @@ bool CSkypeProto::LogIn() if (this->IsOnline() || !this->PrepareLogin())
return false;
- if (this->GetAccount(::mir_u2a(this->login), this->account))
+ if (this->GetAccount((char*)_T2A(this->login), this->account))
{
if ( !this->PreparePassword())
return false;
diff --git a/protocols/Skype/src/skype_chat.cpp b/protocols/Skype/src/skype_chat.cpp index 67b2f71d57..56a26d011b 100644 --- a/protocols/Skype/src/skype_chat.cpp +++ b/protocols/Skype/src/skype_chat.cpp @@ -134,12 +134,10 @@ ChatRoom::ChatRoom(const wchar_t *cid, const wchar_t *name, CSkypeProto *ppro) : ChatRoom::~ChatRoom()
{
- if (this->cid != NULL)
- ::mir_free(this->cid);
- if (this->name != NULL)
- ::mir_free(this->name);
- if (this->me != NULL)
- delete this->me;
+ ::mir_free(this->cid);
+ ::mir_free(this->name);
+ delete this->me;
+ delete this->sys;
this->members.destroy();
}
@@ -664,7 +662,7 @@ void ChatRoom::OnEvent(const ConversationRef &conversation, const MessageRef &me ptrW sid = ::mir_utf8decodeW(data);
message->GetPropBodyXml(data);
- ptrW text =::mir_utf8decodeW(CSkypeProto::RemoveHtml(data));
+ ptrW text =::mir_utf8decodeW( ptrA(CSkypeProto::RemoveHtml(data)));
uint timestamp;
message->GetPropTimestamp(timestamp);
@@ -1290,7 +1288,7 @@ ChatRoom *CSkypeProto::FindChatRoom(const wchar_t *cid) GC_INFO gci = {0};
gci.Flags = BYID | DATA;
gci.pszModule = this->m_szModuleName;
- gci.pszID = ::mir_wstrdup(cid);
+ gci.pszID = (wchar_t*)cid;
if ( !::CallServiceSync(MS_GC_GETINFO, 0, (LPARAM)&gci))
return (ChatRoom *)gci.dwItemData;
diff --git a/protocols/Skype/src/skype_messages.cpp b/protocols/Skype/src/skype_messages.cpp index ce1eb4755f..c04b6e2c55 100644 --- a/protocols/Skype/src/skype_messages.cpp +++ b/protocols/Skype/src/skype_messages.cpp @@ -47,7 +47,7 @@ void CSkypeProto::OnMessageReceived(const ConversationRef &conversation, const M message->GetPropConsumptionStatus(status);
message->GetPropBodyXml(data);
- char *text = CSkypeProto::RemoveHtml(data);
+ ptrA text( CSkypeProto::RemoveHtml(data));
ContactRef author;
message->GetPropAuthor(data);
|