OnEvent(EV_PROTO_ONCONTACTDELETED) => PROTO_INTERFACE::OnContactDeleted

3 files changed, 4 insertions, 9 deletions

diff --git a/protocols/IcqOscarJ/src/icq_proto.cpp b/protocols/IcqOscarJ/src/icq_proto.cpp
index a2379109f8..89222ebf96 100644
--- a/protocols/IcqOscarJ/src/icq_proto.cpp
+++ b/protocols/IcqOscarJ/src/icq_proto.cpp
@@ -1821,9 +1821,6 @@ int CIcqProto::OnEvent(PROTOEVENTTYPE eventType, WPARAM wParam, LPARAM lParam)
 		mir_snprintf(szDbSetting, "%sGroups", m_szModuleName);

 		db_delete_module(0, szDbSetting);

 		break;

-

-	case EV_PROTO_ONCONTACTDELETED:

-		return ServListDbContactDeleted(wParam, lParam);

 	}

 	return 1;

 }

diff --git a/protocols/IcqOscarJ/src/icq_proto.h b/protocols/IcqOscarJ/src/icq_proto.h
index 4f4ff59415..e653ef9a3b 100644
--- a/protocols/IcqOscarJ/src/icq_proto.h
+++ b/protocols/IcqOscarJ/src/icq_proto.h
@@ -94,6 +94,7 @@ struct CIcqProto : public PROTO<CIcqProto>
 	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;

 

@@ -664,7 +665,6 @@ struct CIcqProto : public PROTO<CIcqProto>
 	DWORD  icq_addServerPrivacyItem(MCONTACT hContact, DWORD dwUin, char *szUid, WORD wItemId, WORD wType);

 

 	int __cdecl ServListDbSettingChanged(WPARAM wParam, LPARAM lParam);

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

 	int __cdecl ServListCListGroupChange(WPARAM wParam, LPARAM lParam);

 

 	//----| stdpackets.cpp |----------------------------------------------------------

diff --git a/protocols/IcqOscarJ/src/icq_servlist.cpp b/protocols/IcqOscarJ/src/icq_servlist.cpp
index b3c613d017..1720be39bb 100644
--- a/protocols/IcqOscarJ/src/icq_servlist.cpp
+++ b/protocols/IcqOscarJ/src/icq_servlist.cpp
@@ -2259,7 +2259,7 @@ int CIcqProto::ServListDbSettingChanged(WPARAM hContact, LPARAM lParam)
 }

 

 

-int CIcqProto::ServListDbContactDeleted(WPARAM hContact, LPARAM)

+void CIcqProto::OnContactDeleted(MCONTACT hContact)

 {

 	DeleteFromContactsCache(hContact);

 

@@ -2268,13 +2268,13 @@ int CIcqProto::ServListDbContactDeleted(WPARAM hContact, LPARAM)
 		setWord(hContact, "SrvRecordCount", 0);

 

 	if (!icqOnline() || !m_bSsiEnabled)

-		return 0;

+		return;

 

 	// we need all server contacts on local buddy list

 	DWORD dwUIN;

 	uid_str szUID;

 	if (getContactUid(hContact, &dwUIN, &szUID))

-		return 0;

+		return;

 

 	WORD wContactID = getWord(hContact, DBSETTING_SERVLIST_ID, 0);

 	WORD wGroupID = getWord(hContact, DBSETTING_SERVLIST_GROUP, 0);

@@ -2301,8 +2301,6 @@ int CIcqProto::ServListDbContactDeleted(WPARAM hContact, LPARAM)
 		if (wIgnoreID) // delete ignore record

 			icq_removeServerPrivacyItem(hContact, dwUIN, szUID, wIgnoreID, SSI_ITEM_IGNORE);

 	}

-

-	return 0;

 }