diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mir_app/src/clcitems.cpp | 6 | ||||
| -rw-r--r-- | src/mir_app/src/clistmod.cpp | 1 | ||||
| -rw-r--r-- | src/mir_app/src/clistsettings.cpp | 6 | ||||
| -rw-r--r-- | src/mir_app/src/contacts.cpp | 2 |
4 files changed, 4 insertions, 11 deletions
diff --git a/src/mir_app/src/clcitems.cpp b/src/mir_app/src/clcitems.cpp index 15b9f41bfc..7a3c203e8b 100644 --- a/src/mir_app/src/clcitems.cpp +++ b/src/mir_app/src/clcitems.cpp @@ -313,11 +313,11 @@ ClcGroup* fnRemoveItemFromGroup(HWND hwnd, ClcGroup *group, ClcContact *contact, void fnDeleteItemFromTree(HWND hwnd, MCONTACT hItem) { - ClcContact *contact; - ClcGroup *group; struct ClcData *dat = (struct ClcData *) GetWindowLongPtr(hwnd, 0); - dat->needsResort = 1; + + ClcGroup *group; + ClcContact *contact; if (!cli.pfnFindItem(hwnd, dat, hItem, &contact, &group, NULL)) { DBVARIANT dbv; int i, nameOffset; diff --git a/src/mir_app/src/clistmod.cpp b/src/mir_app/src/clistmod.cpp index 6ccdeb7e14..758e34075a 100644 --- a/src/mir_app/src/clistmod.cpp +++ b/src/mir_app/src/clistmod.cpp @@ -431,7 +431,6 @@ int LoadContactListModule2(void) CreateServiceFunction(MS_CLIST_CONTACTDOUBLECLICKED, ContactDoubleClicked);
CreateServiceFunction(MS_CLIST_CONTACTFILESDROPPED, ContactFilesDropped);
- CreateServiceFunction(MS_CLIST_INVALIDATEDISPLAYNAME, InvalidateDisplayName);
CreateServiceFunction(MS_CLIST_CONTACTSCOMPARE, CompareContacts);
CreateServiceFunction(MS_CLIST_CONTACTCHANGEGROUP, ContactChangeGroup);
CreateServiceFunction(MS_CLIST_SHOWHIDE, ShowHideStub);
diff --git a/src/mir_app/src/clistsettings.cpp b/src/mir_app/src/clistsettings.cpp index 390e4d5f38..55aa9ec808 100644 --- a/src/mir_app/src/clistsettings.cpp +++ b/src/mir_app/src/clistsettings.cpp @@ -137,12 +137,6 @@ TCHAR* fnGetContactDisplayName(MCONTACT hContact, int mode) return (cacheEntry == NULL) ? mir_tstrdup(buffer) : buffer;
}
-INT_PTR InvalidateDisplayName(WPARAM wParam, LPARAM)
-{
- cli.pfnInvalidateDisplayNameCacheEntry(wParam);
- return 0;
-}
-
int ContactAdded(WPARAM wParam, LPARAM)
{
cli.pfnChangeContactIcon(wParam, cli.pfnIconFromStatusMode(GetContactProto(wParam), ID_STATUS_OFFLINE, NULL));
diff --git a/src/mir_app/src/contacts.cpp b/src/mir_app/src/contacts.cpp index 1160dcca60..652cde3a4c 100644 --- a/src/mir_app/src/contacts.cpp +++ b/src/mir_app/src/contacts.cpp @@ -412,7 +412,7 @@ public: tvi.hItem = m_nameOrder.GetNextSibling(tvi.hItem);
}
db_set_blob(NULL, "Contact", "NameOrder", nameOrder, _countof(nameOrderDescr));
- CallService(MS_CLIST_INVALIDATEDISPLAYNAME, (WPARAM)INVALID_HANDLE_VALUE, 0);
+ cli.pfnInvalidateDisplayNameCacheEntry(INVALID_CONTACT_ID);
}
void OnBeginDrag(CCtrlTreeView::TEventInfo *evt)
|