From 6433efee2bc3e5642893344af0f82e5138c65cf9 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 20 Aug 2016 18:19:47 +0000 Subject: contact deletion must be processed modally git-svn-id: http://svn.miranda-ng.org/main/trunk@17194 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/mir_app/src/clc.cpp | 7 ------- src/mir_app/src/clistsettings.cpp | 2 ++ 2 files changed, 2 insertions(+), 7 deletions(-) (limited to 'src/mir_app') diff --git a/src/mir_app/src/clc.cpp b/src/mir_app/src/clc.cpp index 23fcc6e060..4bbccb844b 100644 --- a/src/mir_app/src/clc.cpp +++ b/src/mir_app/src/clc.cpp @@ -170,12 +170,6 @@ static int ClcContactAdded(WPARAM wParam, LPARAM lParam) return 0; } -static int ClcContactDeleted(WPARAM wParam, LPARAM lParam) -{ - WindowList_BroadcastAsync(hClcWindowList, INTM_CONTACTDELETED, wParam, lParam); - return 0; -} - static int ClcIconsChanged(WPARAM, LPARAM) { WindowList_BroadcastAsync(hClcWindowList, INTM_INVALIDATE, 0, 0); @@ -218,7 +212,6 @@ int LoadCLCModule(void) HookEvent(ME_PROTO_ACCLISTCHANGED, ClcAccountsChanged); HookEvent(ME_DB_CONTACT_SETTINGCHANGED, ClcSettingChanged); HookEvent(ME_DB_CONTACT_ADDED, ClcContactAdded); - HookEvent(ME_DB_CONTACT_DELETED, ClcContactDeleted); HookEvent(ME_SKIN_ICONSCHANGED, ClcIconsChanged); HookEvent(ME_PROTO_ACK, ClcProtoAck); diff --git a/src/mir_app/src/clistsettings.cpp b/src/mir_app/src/clistsettings.cpp index 86652d5078..259806b594 100644 --- a/src/mir_app/src/clistsettings.cpp +++ b/src/mir_app/src/clistsettings.cpp @@ -135,6 +135,8 @@ int ContactAdded(WPARAM hContact, LPARAM) int ContactDeleted(WPARAM hContact, LPARAM) { + Clist_Broadcast(INTM_CONTACTDELETED, hContact, 0); + int idx = clistCache.getIndex((ClcCacheEntry*)&hContact); if (idx != -1) { cli.pfnFreeCacheItem(clistCache[idx]); -- cgit v1.2.3