OnEvent(EV_PROTO_ONCONTACTDELETED) => PROTO_INTERFACE::OnContactDeleted

3 files changed, 6 insertions, 8 deletions

diff --git a/protocols/MSN/src/msn_proto.cpp b/protocols/MSN/src/msn_proto.cpp
index 7da11cc3ec..3b088aaf66 100644
--- a/protocols/MSN/src/msn_proto.cpp
+++ b/protocols/MSN/src/msn_proto.cpp
@@ -966,9 +966,6 @@ int CMsnProto::OnEvent(PROTOEVENTTYPE eventType, WPARAM wParam, LPARAM lParam)
 		mir_snprintf(szDbsettings, "%s_HTTPS", m_szModuleName);

 		db_delete_module(0, szDbsettings);

 		break;

-

-	case EV_PROTO_ONCONTACTDELETED:

-		return OnContactDeleted(wParam, lParam);

 	}

 	return 1;

 }

diff --git a/protocols/MSN/src/msn_proto.h b/protocols/MSN/src/msn_proto.h
index 9e11b50b49..f64f2da3c7 100644
--- a/protocols/MSN/src/msn_proto.h
+++ b/protocols/MSN/src/msn_proto.h
@@ -66,10 +66,13 @@ struct CMsnProto : public PROTO<CMsnProto>
 	int      UserIsTyping(MCONTACT hContact, int type) override;

 

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

+

+	void     OnContactDeleted(MCONTACT) override;

 	void     OnModulesLoaded() override;

 	void     OnShutdown() override;

 

 	//====| Services |====================================================================

+

 	INT_PTR  __cdecl SvcCreateAccMgrUI(WPARAM wParam, LPARAM lParam);

 

 	INT_PTR  __cdecl GetAvatarInfo(WPARAM wParam, LPARAM lParam);

@@ -87,7 +90,7 @@ struct CMsnProto : public PROTO<CMsnProto>
 	INT_PTR  __cdecl OnLeaveChat(WPARAM wParam, LPARAM lParam);

 

 	//====| Events |======================================================================

-	int  __cdecl OnContactDeleted(WPARAM wParam, LPARAM lParam);

+

 	int  __cdecl OnIdleChanged(WPARAM wParam, LPARAM lParam);

 	int  __cdecl OnGroupChange(WPARAM wParam, LPARAM lParam);

 	int  __cdecl OnOptionsInit(WPARAM wParam, LPARAM lParam);

diff --git a/protocols/MSN/src/msn_svcs.cpp b/protocols/MSN/src/msn_svcs.cpp
index 657aa54881..70ec17fc56 100644
--- a/protocols/MSN/src/msn_svcs.cpp
+++ b/protocols/MSN/src/msn_svcs.cpp
@@ -245,10 +245,10 @@ INT_PTR CMsnProto::SendNudge(WPARAM hContact, LPARAM)
 /////////////////////////////////////////////////////////////////////////////////////////

 // MsnContactDeleted - called when a contact is deleted from list

 

-int CMsnProto::OnContactDeleted(WPARAM hContact, LPARAM)

+void CMsnProto::OnContactDeleted(MCONTACT hContact)

 {

 	if (!msnLoggedIn)  //should never happen for MSN contacts

-		return 0;

+		return;

 

 	if (isChatRoom(hContact)) {

 		DBVARIANT dbv;

@@ -278,8 +278,6 @@ int CMsnProto::OnContactDeleted(WPARAM hContact, LPARAM)
 				MSN_AddUser(hContact, szEmail, 0, LIST_LL | LIST_REMOVE);

 		}

 	}

-

-	return 0;

 }