diff options
| author | George Hazan <george.hazan@gmail.com> | 2016-08-20 18:19:47 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2016-08-20 18:19:47 +0000 |
| commit | 6433efee2bc3e5642893344af0f82e5138c65cf9 (patch) | |
| tree | 8884e09a6d9dc7b63c367ff03d730cc7b6f5ef7b /src | |
| parent | 0aff1b6b30e5f63757d0513a07407641ae3c30a1 (diff) | |
contact deletion must be processed modally
git-svn-id: http://svn.miranda-ng.org/main/trunk@17194 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src')
| -rw-r--r-- | src/mir_app/src/clc.cpp | 7 | ||||
| -rw-r--r-- | src/mir_app/src/clistsettings.cpp | 2 |
2 files changed, 2 insertions, 7 deletions
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]);
|