diff options
| -rw-r--r-- | plugins/Clist_modern/src/init.cpp | 1 | ||||
| -rw-r--r-- | plugins/Clist_modern/src/modern_clcitems.cpp | 9 | ||||
| -rw-r--r-- | plugins/Clist_modern/src/modern_commonprototypes.h | 1 |
3 files changed, 2 insertions, 9 deletions
diff --git a/plugins/Clist_modern/src/init.cpp b/plugins/Clist_modern/src/init.cpp index ab0c22fb4d..97211ed845 100644 --- a/plugins/Clist_modern/src/init.cpp +++ b/plugins/Clist_modern/src/init.cpp @@ -178,7 +178,6 @@ static HRESULT SubclassClistInterface() pcli->pfnLoadCluiGlobalOpts = CLUI_cli_LoadCluiGlobalOpts;
pcli->pfnSortCLC = cli_SortCLC;
pcli->pfnAddGroup = cli_AddGroup;
- pcli->pfnGetGroupCountsText = cli_GetGroupCountsText;
pcli->pfnAddContactToTree = cli_AddContactToTree;
pcli->pfnAddInfoItemToGroup = cli_AddInfoItemToGroup;
pcli->pfnAddItemToGroup = cli_AddItemToGroup;
diff --git a/plugins/Clist_modern/src/modern_clcitems.cpp b/plugins/Clist_modern/src/modern_clcitems.cpp index 5ed3419bc0..866b96d512 100644 --- a/plugins/Clist_modern/src/modern_clcitems.cpp +++ b/plugins/Clist_modern/src/modern_clcitems.cpp @@ -149,6 +149,8 @@ static void _LoadDataToContact(ClcContact *cont, ClcGroup *group, ClcData *dat, if (!cont)
return;
+ pcli->pfnInvalidateDisplayNameCacheEntry(hContact);
+
ClcCacheEntry *cacheEntry = pcli->pfnGetCacheEntry(hContact);
char *szProto = cacheEntry->m_pszProto;
@@ -163,8 +165,6 @@ static void _LoadDataToContact(ClcContact *cont, ClcGroup *group, ClcData *dat, cont->hContact = hContact;
cont->proto = szProto;
- pcli->pfnInvalidateDisplayNameCacheEntry(hContact);
-
if (szProto != NULL && !pcli->pfnIsHiddenMode(dat, cacheEntry->m_iStatus))
cont->flags |= CONTACTF_ONLINE;
@@ -600,11 +600,6 @@ void cli_SetContactCheckboxes(ClcContact *cc, int checked) corecli.pfnSetContactCheckboxes(&cc->subcontacts[i], checked);
}
-TCHAR* cli_GetGroupCountsText(ClcData *dat, ClcContact *contact)
-{
- return corecli.pfnGetGroupCountsText(dat, contact);
-}
-
int cliGetGroupContentsCount(ClcGroup *group, int visibleOnly)
{
int count = group->cl.count;
diff --git a/plugins/Clist_modern/src/modern_commonprototypes.h b/plugins/Clist_modern/src/modern_commonprototypes.h index d83c743db1..addd09a319 100644 --- a/plugins/Clist_modern/src/modern_commonprototypes.h +++ b/plugins/Clist_modern/src/modern_commonprototypes.h @@ -264,7 +264,6 @@ void cli_AddContactToTree(HWND hwnd, ClcData *dat, MCONTACT hContact, int upd void cli_DeleteItemFromTree(HWND hwnd, MCONTACT hItem);
void cli_FreeContact(ClcContact*);
void cli_FreeGroup(ClcGroup*);
-TCHAR* cli_GetGroupCountsText(ClcData *dat, ClcContact *contact);
void cli_SetContactCheckboxes(ClcContact*, int);
LRESULT cli_ProcessExternalMessages(HWND hwnd, ClcData *dat, UINT msg, WPARAM wParam, LPARAM lParam);
CListEvent* cli_AddEvent(CLISTEVENT *cle);
|