PS_CREATEACCMGRUI is obsoleted and converted into event

3 files changed, 5 insertions, 7 deletions

diff --git a/protocols/Discord/src/options.cpp b/protocols/Discord/src/options.cpp
index 3ced623311..4716584b96 100644
--- a/protocols/Discord/src/options.cpp
+++ b/protocols/Discord/src/options.cpp
@@ -77,12 +77,12 @@ public:
 

 /////////////////////////////////////////////////////////////////////////////////////////

 

-INT_PTR CDiscordProto::SvcCreateAccMgrUI(WPARAM, LPARAM hwndParent)

+MWindow CDiscordProto::OnCreateAccMgrUI(MWindow hwndParent)

 {

 	CDiscardAccountOptions *pDlg = new CDiscardAccountOptions(this, IDD_OPTIONS_ACCMGR, false);

-	pDlg->SetParent((HWND)hwndParent);

+	pDlg->SetParent(hwndParent);

 	pDlg->Create();

-	return (INT_PTR)pDlg->GetHwnd();

+	return pDlg->GetHwnd();

 }

 

 int CDiscordProto::OnOptionsInit(WPARAM wParam, LPARAM)

diff --git a/protocols/Discord/src/proto.cpp b/protocols/Discord/src/proto.cpp
index f984595ff4..cf5bd0671f 100644
--- a/protocols/Discord/src/proto.cpp
+++ b/protocols/Discord/src/proto.cpp
@@ -56,8 +56,6 @@ CDiscordProto::CDiscordProto(const char *proto_name, const wchar_t *username) :
 	m_bSyncDeleteMsgs(this, "DeleteServerMsgs", true)

 {

 	// Services

-	CreateProtoService(PS_CREATEACCMGRUI, &CDiscordProto::SvcCreateAccMgrUI);

-

 	CreateProtoService(PS_GETAVATARINFO, &CDiscordProto::GetAvatarInfo);

 	CreateProtoService(PS_GETAVATARCAPS, &CDiscordProto::GetAvatarCaps);

 	CreateProtoService(PS_GETMYAVATAR, &CDiscordProto::GetMyAvatar);

@@ -597,7 +595,7 @@ void CDiscordProto::SendMarkRead()
 	}

 }

 

-void CDiscordProto::OnMarkRead(MCONTACT hContact, MEVENT hDbEvent)

+void CDiscordProto::OnMarkRead(MCONTACT hContact, MEVENT)

 {

 	if (m_bOnline) {

 		m_impl.m_markRead.Start(200);

diff --git a/protocols/Discord/src/proto.h b/protocols/Discord/src/proto.h
index 2c0bd0709a..dd69f60e20 100644
--- a/protocols/Discord/src/proto.h
+++ b/protocols/Discord/src/proto.h
@@ -377,6 +377,7 @@ public:
 

 	void     OnBuildProtoMenu() override;

 	void     OnContactDeleted(MCONTACT) override;

+	MWindow  OnCreateAccMgrUI(MWindow) override;

 	void     OnMarkRead(MCONTACT, MEVENT) override;

 	void     OnModulesLoaded() override;

 	void     OnShutdown() override;

@@ -385,7 +386,6 @@ public:
 	// Services

 

 	INT_PTR __cdecl RequestFriendship(WPARAM, LPARAM);

-	INT_PTR __cdecl SvcCreateAccMgrUI(WPARAM, LPARAM);

 

 	INT_PTR __cdecl GetAvatarCaps(WPARAM, LPARAM);

 	INT_PTR __cdecl GetAvatarInfo(WPARAM, LPARAM);