PS_CREATEACCMGRUI is obsoleted and converted into event

3 files changed, 4 insertions, 6 deletions

diff --git a/protocols/SkypeWeb/src/skype_options.cpp b/protocols/SkypeWeb/src/skype_options.cpp
index 07f15c215a..358440dd1f 100644
--- a/protocols/SkypeWeb/src/skype_options.cpp
+++ b/protocols/SkypeWeb/src/skype_options.cpp
@@ -82,12 +82,12 @@ public:
 

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

 

-INT_PTR CSkypeProto::OnAccountManagerInit(WPARAM, LPARAM lParam)

+MWindow CSkypeProto::OnCreateAccMgrUI(MWindow hwndParent)

 {

 	auto *pDlg = new CSkypeOptionsMain(this, IDD_ACCOUNT_MANAGER);

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

+	pDlg->SetParent(hwndParent);

 	pDlg->Show();

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

+	return pDlg->GetHwnd();

 }

 

 int CSkypeProto::OnOptionsInit(WPARAM wParam, LPARAM)

diff --git a/protocols/SkypeWeb/src/skype_proto.cpp b/protocols/SkypeWeb/src/skype_proto.cpp
index 5a70b171a8..8bf269e682 100644
--- a/protocols/SkypeWeb/src/skype_proto.cpp
+++ b/protocols/SkypeWeb/src/skype_proto.cpp
@@ -38,7 +38,6 @@ CSkypeProto::CSkypeProto(const char* protoName, const wchar_t* userName) :
 	nlu.szSettingsModule = m_szModuleName;

 	m_hNetlibUser = Netlib_RegisterUser(&nlu);

 

-	CreateProtoService(PS_CREATEACCMGRUI, &CSkypeProto::OnAccountManagerInit);

 	CreateProtoService(PS_GETAVATARINFO, &CSkypeProto::SvcGetAvatarInfo);

 	CreateProtoService(PS_GETAVATARCAPS, &CSkypeProto::SvcGetAvatarCaps);

 	CreateProtoService(PS_GETMYAVATAR, &CSkypeProto::SvcGetMyAvatar);

diff --git a/protocols/SkypeWeb/src/skype_proto.h b/protocols/SkypeWeb/src/skype_proto.h
index f2d9c467ac..8a48e595dc 100644
--- a/protocols/SkypeWeb/src/skype_proto.h
+++ b/protocols/SkypeWeb/src/skype_proto.h
@@ -69,6 +69,7 @@ public:
 

 	void     OnBuildProtoMenu(void) override;

 	void     OnContactDeleted(MCONTACT) override;

+	MWindow  OnCreateAccMgrUI(MWindow) override;

 	void     OnMarkRead(MCONTACT, MEVENT) override;

 	void     OnModulesLoaded() override;

 	void     OnShutdown() override;

@@ -186,8 +187,6 @@ private:
 

 	EventHandle m_hTrouterHealthEvent;

 

-	INT_PTR __cdecl OnAccountManagerInit(WPARAM, LPARAM);

-

 	INT_PTR __cdecl SvcGetAvatarInfo(WPARAM, LPARAM);

 	INT_PTR __cdecl SvcGetAvatarCaps(WPARAM, LPARAM);

 	INT_PTR __cdecl SvcGetMyAvatar(WPARAM, LPARAM);