From 0043f79996b6bf582194fd45d42d86ca2816292f Mon Sep 17 00:00:00 2001 From: Alexander Lantsev Date: Fri, 14 Jun 2013 18:26:29 +0000 Subject: Skype: - fixed chat creating/removing - fixed chat inviting - fixed #367 git-svn-id: http://svn.miranda-ng.org/main/trunk@4945 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Skype/src/skype_proto.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'protocols/Skype/src/skype_proto.cpp') diff --git a/protocols/Skype/src/skype_proto.cpp b/protocols/Skype/src/skype_proto.cpp index a717c8948e..3347708837 100644 --- a/protocols/Skype/src/skype_proto.cpp +++ b/protocols/Skype/src/skype_proto.cpp @@ -130,7 +130,7 @@ int __cdecl CSkypeProto::AuthRequest(HANDLE hContact, const TCHAR* szMessage) if (this->IsOnline() && hContact) { CContact::Ref contact; - SEString sid( mir_ptr(::mir_u2a( mir_ptr(::db_get_wsa(hContact, this->m_szModuleName, SKYPE_SETTINGS_LOGIN))))); + SEString sid( mir_ptr(::mir_u2a( mir_ptr(::db_get_wsa(hContact, this->m_szModuleName, SKYPE_SETTINGS_SID))))); if (this->GetContact(sid, contact)) { contact->SetBuddyStatus(Contact::AUTHORIZED_BY_ME); @@ -236,7 +236,7 @@ DWORD_PTR __cdecl CSkypeProto:: GetCaps(int type, HANDLE hContact) case PFLAG_MAXCONTACTSPERPACKET: return 1024; case PFLAG_UNIQUEIDSETTING: - return (DWORD_PTR)SKYPE_SETTINGS_LOGIN; + return (DWORD_PTR)SKYPE_SETTINGS_SID; default: return 0; } @@ -333,7 +333,7 @@ int __cdecl CSkypeProto::SendContacts(HANDLE hContact, int flags, int nContacts, { this->Log(L"Outcoming contacts"); SEStringList targets; - mir_ptr sid(::db_get_wsa(hContact, this->m_szModuleName, SKYPE_SETTINGS_LOGIN)); + mir_ptr sid(::db_get_wsa(hContact, this->m_szModuleName, SKYPE_SETTINGS_SID)); targets.append((char *)mir_ptr(::mir_utf8encodeW(sid))); CConversation::Ref conversation; @@ -344,7 +344,7 @@ int __cdecl CSkypeProto::SendContacts(HANDLE hContact, int flags, int nContacts, { CContact::Ref contact; - mir_ptr csid(::db_get_wsa(hContactsList[i], this->m_szModuleName, SKYPE_SETTINGS_LOGIN)); + mir_ptr csid(::db_get_wsa(hContactsList[i], this->m_szModuleName, SKYPE_SETTINGS_SID)); this->GetContact((char *)mir_ptr(::mir_utf8encodeW(csid)), contact); contacts.append(contact); } @@ -375,7 +375,7 @@ HANDLE __cdecl CSkypeProto::SendFile(HANDLE hContact, const TCHAR *szDescription { this->Log(L"Outcoming file transfer"); SEStringList targets; - mir_ptr sid(::db_get_wsa(hContact, this->m_szModuleName, SKYPE_SETTINGS_LOGIN)); + mir_ptr sid(::db_get_wsa(hContact, this->m_szModuleName, SKYPE_SETTINGS_SID)); targets.append((char *)mir_ptr(::mir_utf8encodeW(sid))); CConversation::Ref conversation; @@ -413,7 +413,7 @@ int __cdecl CSkypeProto::SendMsg(HANDLE hContact, int flags, const char *msg) { this->Log(L"Outcoming message"); SEStringList targets; - mir_ptr sid( ::db_get_wsa(hContact, this->m_szModuleName, SKYPE_SETTINGS_LOGIN)); + mir_ptr sid( ::db_get_wsa(hContact, this->m_szModuleName, SKYPE_SETTINGS_SID)); SEString identity = ::mir_u2a(sid); targets.append(identity); @@ -496,7 +496,7 @@ int __cdecl CSkypeProto::UserIsTyping(HANDLE hContact, int type) { if (hContact && this->IsOnline() && this->m_iStatus != ID_STATUS_INVISIBLE) { - mir_ptr sid( ::db_get_wsa(hContact, this->m_szModuleName, SKYPE_SETTINGS_LOGIN)); + mir_ptr sid( ::db_get_wsa(hContact, this->m_szModuleName, SKYPE_SETTINGS_SID)); if (::wcsicmp(sid, this->login) != 0) { SEStringList targets; -- cgit v1.2.3