From 13c65091dba7803ddc8b604732d3cf3e8cb2fe5d Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 11 Feb 2023 18:58:29 +0300 Subject: PS_CREATEACCMGRUI is obsoleted and converted into event --- protocols/JabberG/src/jabber_opt.cpp | 6 +++--- protocols/JabberG/src/jabber_proto.cpp | 2 -- protocols/JabberG/src/jabber_proto.h | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) (limited to 'protocols/JabberG/src') diff --git a/protocols/JabberG/src/jabber_opt.cpp b/protocols/JabberG/src/jabber_opt.cpp index 5313e260fb..c516232099 100644 --- a/protocols/JabberG/src/jabber_opt.cpp +++ b/protocols/JabberG/src/jabber_opt.cpp @@ -1400,11 +1400,11 @@ private: } }; -INT_PTR CJabberProto::SvcCreateAccMgrUI(WPARAM, LPARAM lParam) +MWindow CJabberProto::OnCreateAccMgrUI(MWindow hwndParent) { - CJabberDlgAccMgrUI *dlg = new CJabberDlgAccMgrUI(this, (HWND)lParam); + CJabberDlgAccMgrUI *dlg = new CJabberDlgAccMgrUI(this, hwndParent); dlg->Show(); - return (INT_PTR)dlg->GetHwnd(); + return dlg->GetHwnd(); } INT_PTR __cdecl CJabberProto::OnMenuOptions(WPARAM, LPARAM) diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp index 6c425da2c4..a00e52b195 100644 --- a/protocols/JabberG/src/jabber_proto.cpp +++ b/protocols/JabberG/src/jabber_proto.cpp @@ -148,8 +148,6 @@ CJabberProto::CJabberProto(const char *aProtoName, const wchar_t *aUserName) : m_hEventXStatusIconChanged = CreateProtoEvent(JE_CUSTOMSTATUS_EXTRAICON_CHANGED); m_hEventXStatusChanged = CreateProtoEvent(JE_CUSTOMSTATUS_CHANGED); - CreateProtoService(PS_CREATEACCMGRUI, &CJabberProto::SvcCreateAccMgrUI); - CreateProtoService(PS_GETAVATARINFO, &CJabberProto::JabberGetAvatarInfo); CreateProtoService(PS_GETMYAWAYMSG, &CJabberProto::GetMyAwayMsg); CreateProtoService(PS_SET_LISTENINGTO, &CJabberProto::OnSetListeningTo); diff --git a/protocols/JabberG/src/jabber_proto.h b/protocols/JabberG/src/jabber_proto.h index 9f5d8d5c0b..643b432bd0 100644 --- a/protocols/JabberG/src/jabber_proto.h +++ b/protocols/JabberG/src/jabber_proto.h @@ -150,12 +150,12 @@ struct CJabberProto : public PROTO, public IJabberInterface void OnBuildProtoMenu(void) override; void OnContactDeleted(MCONTACT) override; + MWindow OnCreateAccMgrUI(MWindow) override; void OnMarkRead(MCONTACT, MEVENT) override; void OnModulesLoaded() override; void OnShutdown() override; //====| Services |==================================================================== - INT_PTR __cdecl SvcCreateAccMgrUI(WPARAM wParam, LPARAM lParam); INT_PTR __cdecl GetMyAwayMsg(WPARAM wParam, LPARAM lParam); INT_PTR __cdecl JabberVOIP_call(WPARAM hContact, LPARAM); -- cgit v1.2.3