summaryrefslogtreecommitdiff
path: root/protocols/Skype/src/skype_contacts.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'protocols/Skype/src/skype_contacts.cpp')
-rw-r--r--protocols/Skype/src/skype_contacts.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/protocols/Skype/src/skype_contacts.cpp b/protocols/Skype/src/skype_contacts.cpp
index fbbb4c00bc..f50d60e416 100644
--- a/protocols/Skype/src/skype_contacts.cpp
+++ b/protocols/Skype/src/skype_contacts.cpp
@@ -166,8 +166,8 @@ HANDLE CSkypeProto::GetContactBySid(const wchar_t *sid)
{
if (this->IsProtoContact(hContact) && !this->IsChatRoom(hContact))
{
- std::wstring contactSid = ::db_get_wsa(hContact, this->m_szModuleName, SKYPE_SETTINGS_LOGIN);
- if (contactSid.compare(sid) == 0)
+ mir_ptr<wchar_t> contactSid( ::db_get_wsa(hContact, this->m_szModuleName, SKYPE_SETTINGS_LOGIN));
+ if ( lstrcmp(contactSid, sid) == 0)
return hContact;
}
@@ -278,13 +278,13 @@ void __cdecl CSkypeProto::LoadContactList(void* data)
this->UpdateContactAuthState(hContact, contact);
this->UpdateContactStatus(hContact, contact);
- wchar_t *nick = ::db_get_wsa(hContact, "CList", "MyHandle");
+ mir_ptr<wchar_t> nick( ::db_get_wsa(hContact, "CList", "MyHandle"));
if ( !nick || !::wcslen(nick))
{
SEString data;
contact->GetPropFullname(data);
- mir_ptr<wchar_t> nick = ::mir_utf8decodeW(data);
+ nick = ::mir_utf8decodeW(data);
::db_set_ws(hContact, "CList", "MyHandle", nick);
}