From 73d66eaffe6fb0b0b422c3c9a7e24f4914d370fe Mon Sep 17 00:00:00 2001 From: MikalaiR Date: Sun, 26 Apr 2015 10:24:55 +0000 Subject: SkypeWeb: Chat destoying fix. Other fixes. git-svn-id: http://svn.miranda-ng.org/main/trunk@13159 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/SkypeWeb/src/skype_chatrooms.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'protocols') diff --git a/protocols/SkypeWeb/src/skype_chatrooms.cpp b/protocols/SkypeWeb/src/skype_chatrooms.cpp index 2347d73740..73b511b77d 100644 --- a/protocols/SkypeWeb/src/skype_chatrooms.cpp +++ b/protocols/SkypeWeb/src/skype_chatrooms.cpp @@ -264,9 +264,9 @@ INT_PTR CSkypeProto::SvcDestroyChat(WPARAM hContact, LPARAM) if (!IsOnline()) return 1; - ptrA chatId(db_get_sa(hContact, m_szModuleName, SKYPE_SETTINGS_ID)); + ptrT chatId(db_get_tsa(hContact, m_szModuleName, "ChatRoomID")); - SendRequest(new KickUserRequest(RegToken, chatId, SelfSkypeName, Server)); + SendRequest(new KickUserRequest(RegToken, _T2A(chatId), SelfSkypeName, Server)); CallService(MS_DB_CONTACT_DELETE, (WPARAM)hContact, 0); @@ -291,9 +291,9 @@ void CSkypeProto::OnChatEvent(JSONNODE *node) ptrA conversationLink(mir_t2a(ptrT(json_as_string(json_get(node, "conversationLink"))))); ptrA chatname(ChatUrlToName(conversationLink)); - ptrT topic(json_as_string(json_get(node, "threadtopic"))); + TCHAR *topic(json_as_string(json_get(node, "threadtopic"))); - if (FindChatRoom(chatname) == NULL) StartChatRoom(_A2T(chatname), topic); + if (FindChatRoom(chatname) == NULL) SendRequest(new GetChatInfoRequest(RegToken, chatname, Server), &CSkypeProto::OnGetChatInfo, topic); ptrA messageType(mir_t2a(ptrT(json_as_string(json_get(node, "messagetype"))))); if (!mir_strcmpi(messageType, "Text") || !mir_strcmpi(messageType, "RichText")) -- cgit v1.2.3