From 6165d65054185f4117cb625eb738b96d3a7032ef Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 14 Jun 2013 20:04:15 +0000 Subject: - memory corruption fix; - fix for the annoying bug with going offline when a proto is actually online git-svn-id: http://svn.miranda-ng.org/main/trunk@4948 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Skype/src/skype_account.cpp | 6 +++--- protocols/Skype/src/skype_chat.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'protocols') diff --git a/protocols/Skype/src/skype_account.cpp b/protocols/Skype/src/skype_account.cpp index 39f4e52317..2642ef0da6 100644 --- a/protocols/Skype/src/skype_account.cpp +++ b/protocols/Skype/src/skype_account.cpp @@ -346,14 +346,14 @@ void CSkypeProto::OnAccountChanged(int prop) this->UpdateProfile(this->account.fetch()); break; - case Account::P_AVAILABILITY: +/* case Account::P_AVAILABILITY: { Contact::AVAILABILITY status; this->account->GetPropAvailability(status); int mir_status = this->SkypeToMirandaStatus(status); - if (mir_status != this->m_iStatus) + if (mir_status != this->m_iStatus && mir_status >= ID_STATUS_OFFLINE) this->SetStatus(mir_status); } - break; + break;*/ } } \ No newline at end of file diff --git a/protocols/Skype/src/skype_chat.cpp b/protocols/Skype/src/skype_chat.cpp index 4276df71dc..600de624b2 100644 --- a/protocols/Skype/src/skype_chat.cpp +++ b/protocols/Skype/src/skype_chat.cpp @@ -1334,7 +1334,7 @@ void CSkypeProto:: UpdateChatUserNick(CContact::Ref contact) contact->GetPropFullname(data); ptrW nick(::mir_utf8decodeW(data)); if (data.length() == 0) - nick = sid; + nick = (WCHAR*)sid; GC_INFO gci = {0}; gci.Flags = BYINDEX | DATA; -- cgit v1.2.3