OnEvent(EV_PROTO_ONCONTACTDELETED) => PROTO_INTERFACE::OnContactDeleted

3 files changed, 5 insertions, 11 deletions

diff --git a/protocols/SkypeWeb/src/skype_contacts.cpp b/protocols/SkypeWeb/src/skype_contacts.cpp
index b9c7513840..d345821194 100644
--- a/protocols/SkypeWeb/src/skype_contacts.cpp
+++ b/protocols/SkypeWeb/src/skype_contacts.cpp
@@ -282,13 +282,11 @@ INT_PTR CSkypeProto::OnGrantAuth(WPARAM hContact, LPARAM)
 	return 0;

 }

 

-int CSkypeProto::OnContactDeleted(MCONTACT hContact, LPARAM)

+void CSkypeProto::OnContactDeleted(MCONTACT hContact)

 {

-	if (!IsOnline()) return 1;

-

-	if (hContact && !isChatRoom(hContact))

-		PushRequest(new DeleteContactRequest(li, Contacts[hContact]));

-	return 0;

+	if (IsOnline())

+		if (hContact && !isChatRoom(hContact))

+			PushRequest(new DeleteContactRequest(li, Contacts[hContact]));

 }

 

 INT_PTR CSkypeProto::BlockContact(WPARAM hContact, LPARAM)

diff --git a/protocols/SkypeWeb/src/skype_proto.cpp b/protocols/SkypeWeb/src/skype_proto.cpp
index e1a702e565..cd5baa7bc0 100644
--- a/protocols/SkypeWeb/src/skype_proto.cpp
+++ b/protocols/SkypeWeb/src/skype_proto.cpp
@@ -301,9 +301,6 @@ int CSkypeProto::UserIsTyping(MCONTACT hContact, int type)
 int CSkypeProto::OnEvent(PROTOEVENTTYPE iEventType, WPARAM wParam, LPARAM lParam)
 {
 	switch (iEventType) {
-	case EV_PROTO_ONCONTACTDELETED:
-		return OnContactDeleted(wParam, lParam);
-
 	case EV_PROTO_ONMENU:
 		return OnInitStatusMenu();
 	}
diff --git a/protocols/SkypeWeb/src/skype_proto.h b/protocols/SkypeWeb/src/skype_proto.h
index 7162695ea3..b9c9d96f4a 100644
--- a/protocols/SkypeWeb/src/skype_proto.h
+++ b/protocols/SkypeWeb/src/skype_proto.h
@@ -55,6 +55,7 @@ public:
 	int      SetAwayMsg(int m_iStatus, const wchar_t *msg) override;

 

 	int      OnEvent(PROTOEVENTTYPE iEventType, WPARAM wParam, LPARAM lParam) override;

+	void     OnContactDeleted(MCONTACT) override;

 	void     OnModulesLoaded() override;

 	void     OnShutdown() override;

 

@@ -288,8 +289,6 @@ private:
 	void LoadContactsInfo(const NETLIBHTTPREQUEST *response);

 	void LoadContactList(const NETLIBHTTPREQUEST *response);

 

-	int __cdecl OnContactDeleted(MCONTACT, LPARAM);

-

 	void OnBlockContact(const NETLIBHTTPREQUEST *response, void *p);

 	void OnUnblockContact(const NETLIBHTTPREQUEST *response, void *p);