From 1338ad89ee45bdb681c531476dca00a377d7d033 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 3 Dec 2023 17:14:30 +0300 Subject: PROTO_INTERFACE::SendMsg: second parameter became a reply event id --- protocols/JabberG/src/jabber_chat.cpp | 2 +- protocols/JabberG/src/jabber_omemo.cpp | 2 +- protocols/JabberG/src/jabber_proto.cpp | 2 +- protocols/JabberG/src/jabber_proto.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'protocols/JabberG/src') diff --git a/protocols/JabberG/src/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp index e54817fe25..6906c24c2b 100644 --- a/protocols/JabberG/src/jabber_chat.cpp +++ b/protocols/JabberG/src/jabber_chat.cpp @@ -1348,7 +1348,7 @@ int CJabberProto::JabberGcEventHook(WPARAM, LPARAM lParam) if (gch->ptszText && mir_wstrlen(gch->ptszText) > 0) { rtrimw(gch->ptszText); Chat_UnescapeTags(gch->ptszText); - SendMsg(item->hContact, T2Utf(gch->ptszText)); + SendMsg(item->hContact, 0, T2Utf(gch->ptszText)); } break; diff --git a/protocols/JabberG/src/jabber_omemo.cpp b/protocols/JabberG/src/jabber_omemo.cpp index 6e0b7a172c..d1f921f9b4 100644 --- a/protocols/JabberG/src/jabber_omemo.cpp +++ b/protocols/JabberG/src/jabber_omemo.cpp @@ -1206,7 +1206,7 @@ void CJabberProto::OmemoPutMessageToOutgoingQueue(MCONTACT hContact, const char* void CJabberProto::OmemoHandleMessageQueue() { for (auto &i : m_omemo.outgoing_messages) { - SendMsg(i.hContact, i.pszSrc); + SendMsg(i.hContact, 0, i.pszSrc); mir_free(i.pszSrc); } m_omemo.outgoing_messages.clear(); diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp index 03a1ce8aa3..8b6363b67a 100644 --- a/protocols/JabberG/src/jabber_proto.cpp +++ b/protocols/JabberG/src/jabber_proto.cpp @@ -883,7 +883,7 @@ HANDLE CJabberProto::SendFile(MCONTACT hContact, const wchar_t *szDescription, w //////////////////////////////////////////////////////////////////////////////////////// // SendMessage - sends a message -int CJabberProto::SendMsg(MCONTACT hContact, const char *pszSrc) +int CJabberProto::SendMsg(MCONTACT hContact, MEVENT, const char *pszSrc) { XmlNode m("message"); return SendMsgEx(hContact, pszSrc, m); diff --git a/protocols/JabberG/src/jabber_proto.h b/protocols/JabberG/src/jabber_proto.h index c85a2bb988..9078d37f0e 100644 --- a/protocols/JabberG/src/jabber_proto.h +++ b/protocols/JabberG/src/jabber_proto.h @@ -138,7 +138,7 @@ struct CJabberProto : public PROTO, public IJabberInterface int SendContacts(MCONTACT hContact, int flags, int nContacts, MCONTACT *hContactsList) override; HANDLE SendFile(MCONTACT hContact, const wchar_t *szDescription, wchar_t **ppszFiles) override; - int SendMsg(MCONTACT hContact, const char *msg) override; + int SendMsg(MCONTACT hContact, MEVENT, const char *msg) override; int SendMsgEx(MCONTACT hContact, const char *msg, XmlNode &m); int SetApparentMode(MCONTACT hContact, int mode) override; -- cgit v1.2.3