From 7050d6be747e47fc63f5ebd205e8edb2cf9fbf1f Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Fri, 8 Dec 2017 13:17:00 +0300
Subject: unused hook deleted

---
 src/mir_app/src/clistevents.cpp   | 13 +------------
 src/mir_app/src/clistsettings.cpp |  7 +++++++
 2 files changed, 8 insertions(+), 12 deletions(-)

(limited to 'src/mir_app')

diff --git a/src/mir_app/src/clistevents.cpp b/src/mir_app/src/clistevents.cpp
index 6f606155ca..b4b881628e 100644
--- a/src/mir_app/src/clistevents.cpp
+++ b/src/mir_app/src/clistevents.cpp
@@ -325,17 +325,6 @@ int fnEventsProcessTrayDoubleClick(int index)
 	return 0;
 }
 
-static int RemoveEventsForContact(WPARAM wParam, LPARAM)
-{
-	for (int i = g_cliEvents.getCount()-1; i >= 0; i--) {
-		CListEvent &e = g_cliEvents[i];
-		if (e.hContact == wParam)
-			cli.pfnRemoveEvent(wParam, e.hDbEvent);
-	}
-
-	return 0;
-}
-
 static int CListEventSettingsChanged(WPARAM hContact, LPARAM lParam)
 {
 	DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING*)lParam;
@@ -356,7 +345,7 @@ int InitCListEvents(void)
 
 	disableTrayFlash = db_get_b(0, "CList", "DisableTrayFlash", 0);
 	disableIconFlash = db_get_b(0, "CList", "NoIconBlink", 0);
-	HookEvent(ME_DB_CONTACT_DELETED, RemoveEventsForContact);
+
 	HookEvent(ME_DB_CONTACT_SETTINGCHANGED, CListEventSettingsChanged);
 	return 0;
 }
diff --git a/src/mir_app/src/clistsettings.cpp b/src/mir_app/src/clistsettings.cpp
index fd511562d9..6d5239f601 100644
--- a/src/mir_app/src/clistsettings.cpp
+++ b/src/mir_app/src/clistsettings.cpp
@@ -143,6 +143,13 @@ int ContactDeleted(WPARAM hContact, LPARAM)
 		mir_free(clistCache[idx]);
 		clistCache.remove(idx);
 	}
+
+	// remove events for a contact
+	for (int i = g_cliEvents.getCount() - 1; i >= 0; i--) {
+		CListEvent &e = g_cliEvents[i];
+		if (e.hContact == hContact)
+			cli.pfnRemoveEvent(hContact, e.hDbEvent);
+	}
 	return 0;
 }
 
-- 
cgit v1.2.3