From 9885bf54f788e831a80c76001340aa68d31d2aaa Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Wed, 25 Jan 2023 18:34:51 +0300
Subject: Group chats: ChatRoomID setting replaced with real protocol id
---
protocols/SkypeWeb/src/skype_chatrooms.cpp | 4 ++--
protocols/SkypeWeb/src/skype_contacts.cpp | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
(limited to 'protocols/SkypeWeb')
diff --git a/protocols/SkypeWeb/src/skype_chatrooms.cpp b/protocols/SkypeWeb/src/skype_chatrooms.cpp
index 4f27b13c5c..8fcaa6fc31 100644
--- a/protocols/SkypeWeb/src/skype_chatrooms.cpp
+++ b/protocols/SkypeWeb/src/skype_chatrooms.cpp
@@ -214,7 +214,7 @@ int CSkypeProto::OnGroupChatEventHook(WPARAM, LPARAM lParam)
INT_PTR CSkypeProto::OnJoinChatRoom(WPARAM hContact, LPARAM)
{
if (hContact) {
- ptrW idT(getWStringA(hContact, "ChatRoomID"));
+ ptrW idT(getWStringA(hContact, SKYPE_SETTINGS_ID));
ptrW nameT(getWStringA(hContact, "Nick"));
StartChatRoom(idT, nameT != NULL ? nameT : idT);
}
@@ -227,7 +227,7 @@ INT_PTR CSkypeProto::OnLeaveChatRoom(WPARAM hContact, LPARAM)
return 1;
if (hContact && IDYES == MessageBox(nullptr, TranslateT("This chat is going to be destroyed forever with all its contents. This action cannot be undone. Are you sure?"), TranslateT("Warning"), MB_YESNO | MB_ICONQUESTION)) {
- ptrW idT(getWStringA(hContact, "ChatRoomID"));
+ ptrW idT(getWStringA(hContact, SKYPE_SETTINGS_ID));
Chat_Control(m_szModuleName, idT, SESSION_OFFLINE);
Chat_Terminate(m_szModuleName, idT);
diff --git a/protocols/SkypeWeb/src/skype_contacts.cpp b/protocols/SkypeWeb/src/skype_contacts.cpp
index 75827daaf6..4de99c709b 100644
--- a/protocols/SkypeWeb/src/skype_contacts.cpp
+++ b/protocols/SkypeWeb/src/skype_contacts.cpp
@@ -34,7 +34,7 @@ void CSkypeProto::SetContactStatus(MCONTACT hContact, uint16_t status)
void CSkypeProto::SetChatStatus(MCONTACT hContact, int iStatus)
{
- ptrW tszChatID(getWStringA(hContact, "ChatRoomID"));
+ ptrW tszChatID(getWStringA(hContact, SKYPE_SETTINGS_ID));
if (tszChatID != NULL)
Chat_Control(m_szModuleName, tszChatID, (iStatus == ID_STATUS_OFFLINE) ? SESSION_OFFLINE : SESSION_ONLINE);
}
@@ -239,7 +239,7 @@ void CSkypeProto::OnContactDeleted(MCONTACT hContact)
{
if (IsOnline() && hContact) {
if (isChatRoom(hContact))
- PushRequest(new DestroyChatroomRequest(getMStringA(hContact, "ChatRoomID")));
+ PushRequest(new DestroyChatroomRequest(getMStringA(hContact, SKYPE_SETTINGS_ID)));
else
PushRequest(new DeleteContactRequest(getId(hContact)));
}
--
cgit v1.2.3