From d4b6de0fb4ca58063eb2f424c77e74e703022b63 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 4 Apr 2018 21:07:46 +0300 Subject: static function CLIST_INTERFACE::pfnGetContactIcon exported as Clist_GetContactIcon (history++ to be recompiled) --- plugins/Clist_modern/src/init.cpp | 1 - plugins/Clist_modern/src/modern_clc.cpp | 8 ++++---- plugins/Clist_modern/src/modern_clcitems.cpp | 4 ++-- plugins/Clist_modern/src/modern_clistevents.cpp | 6 +++--- plugins/Clist_modern/src/modern_clistmod.cpp | 8 -------- plugins/Clist_modern/src/modern_commonprototypes.h | 1 - plugins/Clist_nicer/src/clc.cpp | 4 ++-- plugins/Clist_nicer/src/clcitems.cpp | 4 ++-- plugins/Clist_nicer/src/clcpaint.cpp | 4 ++-- plugins/Clist_nicer/src/clistevents.cpp | 2 +- plugins/FavContacts/src/menu.cpp | 2 +- plugins/FloatingContacts/src/thumbs.cpp | 4 ++-- plugins/HistoryPlusPlus/GlobalSearch.pas | 2 +- plugins/NewAwaySysMod/src/ContactList.cpp | 2 +- plugins/QuickContacts/src/quickcontacts.cpp | 4 ++-- plugins/QuickSearch/sr_window.pas | 2 +- plugins/RecentContacts/src/RecentContacts.cpp | 2 +- plugins/SeenPlugin/src/missed.cpp | 2 +- plugins/TipperYM/src/popwin.cpp | 2 +- 19 files changed, 27 insertions(+), 37 deletions(-) (limited to 'plugins') diff --git a/plugins/Clist_modern/src/init.cpp b/plugins/Clist_modern/src/init.cpp index 03be2402e9..553f41a45a 100644 --- a/plugins/Clist_modern/src/init.cpp +++ b/plugins/Clist_modern/src/init.cpp @@ -174,7 +174,6 @@ static HRESULT SubclassClistInterface() pcli->pfnGetContactHiddenStatus = CLVM_GetContactHiddenStatus; // partialy overloaded - call default handlers from inside - pcli->pfnGetContactIcon = cli_GetContactIcon; pcli->pfnIconFromStatusMode = cli_IconFromStatusMode; pcli->pfnLoadCluiGlobalOpts = CLUI_cli_LoadCluiGlobalOpts; pcli->pfnLoadClcOptions = cli_LoadCLCOptions; diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp index 090f7c5284..7cfbdaeddd 100644 --- a/plugins/Clist_modern/src/modern_clc.cpp +++ b/plugins/Clist_modern/src/modern_clc.cpp @@ -1317,7 +1317,7 @@ static LRESULT clcOnIntmGroupChanged(ClcData *dat, HWND hwnd, UINT, WPARAM wPara static LRESULT clcOnIntmIconChanged(ClcData *dat, HWND hwnd, UINT, WPARAM wParam, LPARAM lParam) { bool needRepaint = false; - int contacticon = corecli.pfnGetContactIcon(wParam); + int contacticon = Clist_GetContactIcon(wParam); MCONTACT hSelItem = 0; ClcGroup *selgroup; @@ -1333,7 +1333,7 @@ static LRESULT clcOnIntmIconChanged(ClcData *dat, HWND hwnd, UINT, WPARAM wParam bool isVisiblebyFilter = (((style & CLS_SHOWHIDDEN) && nHiddenStatus != -1) || !nHiddenStatus); bool ifVisibleByClui = !pcli->pfnIsHiddenMode(dat, status); bool isVisible = (g_CluiData.bFilterEffective & CLVM_FILTER_STATUS) ? TRUE : ifVisibleByClui; - bool isIconChanged = cli_GetContactIcon(wParam) != LOWORD(lParam); + bool isIconChanged = Clist_GetContactIcon(wParam) != LOWORD(lParam); int shouldShow = isVisiblebyFilter && (isVisible || isIconChanged); @@ -1513,11 +1513,11 @@ static LRESULT clcOnIntmStatusChanged(ClcData *dat, HWND hwnd, UINT msg, WPARAM Cache_GetNthLineText(dat, pdnce, 3); } - SendMessage(hwnd, INTM_ICONCHANGED, wParam, corecli.pfnGetContactIcon(wParam)); + SendMessage(hwnd, INTM_ICONCHANGED, wParam, Clist_GetContactIcon(wParam)); if (contact->type == CLCIT_CONTACT) { if (!contact->bImageIsSpecial && pdnce->getStatus() > ID_STATUS_OFFLINE) - contact->iImage = corecli.pfnGetContactIcon(wParam); + contact->iImage = Clist_GetContactIcon(wParam); if (contact->iSubNumber && contact->subcontacts && contact->subcontacts->type == CLCIT_CONTACT) Clist_Broadcast(INTM_STATUSCHANGED, contact->subcontacts->hContact, 0); //forward status changing to host meta contact } diff --git a/plugins/Clist_modern/src/modern_clcitems.cpp b/plugins/Clist_modern/src/modern_clcitems.cpp index 557f4edbe3..9dfe3505b6 100644 --- a/plugins/Clist_modern/src/modern_clcitems.cpp +++ b/plugins/Clist_modern/src/modern_clcitems.cpp @@ -61,7 +61,7 @@ void AddSubcontacts(ClcData *dat, ClcContact *cont, BOOL showOfflineHereGroup) p.avatar_pos = AVATAR_POS_DONT_HAVE; Cache_GetAvatar(dat, &p); - p.iImage = corecli.pfnGetContactIcon(pdnce->hContact); + p.iImage = Clist_GetContactIcon(pdnce->hContact); memset(p.iExtraImage, 0xFF, sizeof(p.iExtraImage)); p.proto = pdnce->szProto; p.type = CLCIT_CONTACT; @@ -163,7 +163,7 @@ static void _LoadDataToContact(ClcContact *cont, ClcCacheEntry *pdnce, ClcGroup Cache_GetAvatar(dat, cont); Cache_GetText(dat, cont); Cache_GetTimezone(dat, cont->hContact); - cont->iImage = corecli.pfnGetContactIcon(hContact); + cont->iImage = Clist_GetContactIcon(hContact); cont->bContactRate = db_get_b(hContact, "CList", "Rate", 0); } diff --git a/plugins/Clist_modern/src/modern_clistevents.cpp b/plugins/Clist_modern/src/modern_clistevents.cpp index a336f326f9..bfc45dcb56 100644 --- a/plugins/Clist_modern/src/modern_clistevents.cpp +++ b/plugins/Clist_modern/src/modern_clistevents.cpp @@ -288,7 +288,7 @@ static int EventArea_DrawWorker(HWND hWnd, HDC hDC) rc.left += 26; if (g_CluiData.hUpdateContact != 0) { wchar_t *szName = pcli->pfnGetContactDisplayName(g_CluiData.hUpdateContact, 0); - int iIcon = cli_GetContactIcon(g_CluiData.hUpdateContact); + int iIcon = Clist_GetContactIcon(g_CluiData.hUpdateContact); ske_ImageList_DrawEx(g_himlCListClc, iIcon, hDC, rc.left, (rc.bottom + rc.top - GetSystemMetrics(SM_CYSMICON)) / 2, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), CLR_NONE, CLR_NONE, ILD_NORMAL); rc.left += 18; @@ -303,7 +303,7 @@ static int EventArea_DrawWorker(HWND hWnd, HDC hDC) NotifyMenuItemExData *nmi = (struct NotifyMenuItemExData *) mii.dwItemData; wchar_t *szName = pcli->pfnGetContactDisplayName(nmi->hContact, 0); - int iIcon = cli_GetContactIcon(nmi->hContact); + int iIcon = Clist_GetContactIcon(nmi->hContact); ske_ImageList_DrawEx(g_himlCListClc, iIcon, hDC, rc.left, (rc.bottom + rc.top - GetSystemMetrics(SM_CYSMICON)) / 2, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), CLR_NONE, CLR_NONE, ILD_NORMAL); rc.left += 18; ske_ImageList_DrawEx(g_himlCListClc, nmi->iIcon, hDC, 4, (rc.bottom + rc.top) / 2 - 8, 16, 16, CLR_NONE, CLR_NONE, ILD_NORMAL); @@ -366,7 +366,7 @@ static LRESULT CALLBACK EventArea_WndProc(HWND hwnd, UINT msg, WPARAM wParam, LP if (GetMenuItemInfoA(g_CluiData.hMenuNotify, (UINT)dis->itemID, FALSE, &mii) != 0) { NotifyMenuItemExData *nmi = (NotifyMenuItemExData *)mii.dwItemData; if (nmi) { - int iIcon = cli_GetContactIcon(nmi->hContact); + int iIcon = Clist_GetContactIcon(nmi->hContact); ske_ImageList_DrawEx(g_himlCListClc, nmi->iIcon, dis->hDC, 2, (dis->rcItem.bottom + dis->rcItem.top - GetSystemMetrics(SM_CYSMICON)) / 2, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), CLR_NONE, CLR_NONE, ILD_NORMAL); ske_ImageList_DrawEx(g_himlCListClc, iIcon, dis->hDC, 2 + GetSystemMetrics(SM_CXSMICON) + 2, (dis->rcItem.bottom + dis->rcItem.top - GetSystemMetrics(SM_CYSMICON)) / 2, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), CLR_NONE, CLR_NONE, ILD_NORMAL); return TRUE; diff --git a/plugins/Clist_modern/src/modern_clistmod.cpp b/plugins/Clist_modern/src/modern_clistmod.cpp index 650bd4181a..7d1bf35620 100644 --- a/plugins/Clist_modern/src/modern_clistmod.cpp +++ b/plugins/Clist_modern/src/modern_clistmod.cpp @@ -105,14 +105,6 @@ int cli_IconFromStatusMode(const char *szProto, int nStatus, MCONTACT hContact) return corecli.pfnIconFromStatusMode(szProto, nStatus, 0); } -int cli_GetContactIcon(MCONTACT hContact) -{ - int res = corecli.pfnGetContactIcon(hContact); - if (res != -1) - res &= 0xFFFF; - return res; -} - int GetContactIconC(ClcCacheEntry *p) { return pcli->pfnIconFromStatusMode(p->szProto, p->szProto == nullptr ? ID_STATUS_OFFLINE : p->m_iStatus, p->hContact); diff --git a/plugins/Clist_modern/src/modern_commonprototypes.h b/plugins/Clist_modern/src/modern_commonprototypes.h index d1cdfe9726..0a3245518b 100644 --- a/plugins/Clist_modern/src/modern_commonprototypes.h +++ b/plugins/Clist_modern/src/modern_commonprototypes.h @@ -233,7 +233,6 @@ int cliGetGroupContentsCount(ClcGroup *group, int visibleOnly); int cliFindRowByText(HWND hwnd, ClcData *dat, const wchar_t *text, int prefixOk); int cliGetRowsPriorTo(ClcGroup *group, ClcGroup *subgroup, int contactIndex); int cli_IconFromStatusMode(const char *szProto, int nStatus, MCONTACT hContact); -int cli_GetContactIcon(MCONTACT hContact); int cli_RemoveEvent(MCONTACT hContact, MEVENT hDbEvent); void cli_FreeContact(ClcContact*); void cli_SetContactCheckboxes(ClcContact*, int); diff --git a/plugins/Clist_nicer/src/clc.cpp b/plugins/Clist_nicer/src/clc.cpp index d1c94a1ff9..c56b4265d7 100644 --- a/plugins/Clist_nicer/src/clc.cpp +++ b/plugins/Clist_nicer/src/clc.cpp @@ -320,7 +320,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L int shouldShow = (GetWindowLongPtr(hwnd, GWL_STYLE) & CLS_SHOWHIDDEN || !CLVM_GetContactHiddenStatus(hContact, szProto, dat)) && ((cfg::dat.bFilterEffective ? TRUE : !pcli->pfnIsHiddenMode(dat, status)) || - pcli->pfnGetContactIcon(hContact) != lParam); // XXX CLVM changed - this means an offline msg is flashing, so the contact should be shown + Clist_GetContactIcon(hContact) != lParam); // XXX CLVM changed - this means an offline msg is flashing, so the contact should be shown if (!Clist_FindItem(hwnd, dat, hContact, &contact, &group, nullptr)) { if (shouldShow && db_is_contact(wParam)) { @@ -377,7 +377,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L if (contact->bIsMeta && !(cfg::dat.dwFlags & CLUI_USEMETAICONS)) { contact->hSubContact = db_mc_getMostOnline(contact->hContact); contact->metaProto = GetContactProto(contact->hSubContact); - contact->iImage = pcli->pfnGetContactIcon(contact->hSubContact); + contact->iImage = Clist_GetContactIcon(contact->hSubContact); if (contact->pExtra) { TExtraCache *pSub = cfg::getCache(contact->hSubContact, contact->metaProto); ClcContact *subContact; diff --git a/plugins/Clist_nicer/src/clcitems.cpp b/plugins/Clist_nicer/src/clcitems.cpp index a85e549302..45eb501421 100644 --- a/plugins/Clist_nicer/src/clcitems.cpp +++ b/plugins/Clist_nicer/src/clcitems.cpp @@ -108,10 +108,10 @@ ClcContact* AddContactToGroup(struct ClcData *dat, ClcGroup *group, MCONTACT hCo if (p->bIsMeta && !(cfg::dat.dwFlags & CLUI_USEMETAICONS)) { p->hSubContact = db_mc_getMostOnline(hContact); p->metaProto = GetContactProto(p->hSubContact); - p->iImage = pcli->pfnGetContactIcon(p->hSubContact); + p->iImage = Clist_GetContactIcon(p->hSubContact); } else { - p->iImage = pcli->pfnGetContactIcon(hContact); + p->iImage = Clist_GetContactIcon(hContact); p->metaProto = nullptr; } diff --git a/plugins/Clist_nicer/src/clcpaint.cpp b/plugins/Clist_nicer/src/clcpaint.cpp index 2aceaab9ee..88dbc9f368 100644 --- a/plugins/Clist_nicer/src/clcpaint.cpp +++ b/plugins/Clist_nicer/src/clcpaint.cpp @@ -201,7 +201,7 @@ void PaintNotifyArea(HDC hDC, RECT *rc) int iCount = GetMenuItemCount(cfg::dat.hMenuNotify); if (cfg::dat.hUpdateContact != 0) { wchar_t *szName = pcli->pfnGetContactDisplayName(cfg::dat.hUpdateContact, 0); - int iIcon = pcli->pfnGetContactIcon(cfg::dat.hUpdateContact); + int iIcon = Clist_GetContactIcon(cfg::dat.hUpdateContact); ImageList_DrawEx(hCListImages, iIcon, hDC, rc->left, (rc->bottom + rc->top - g_cysmIcon) / 2, g_cxsmIcon, g_cysmIcon, CLR_NONE, CLR_NONE, ILD_NORMAL); rc->left += 18; @@ -216,7 +216,7 @@ void PaintNotifyArea(HDC hDC, RECT *rc) NotifyMenuItemExData *nmi = (struct NotifyMenuItemExData *) mii.dwItemData; wchar_t *szName = pcli->pfnGetContactDisplayName(nmi->hContact, 0); - int iIcon = pcli->pfnGetContactIcon(nmi->hContact); + int iIcon = Clist_GetContactIcon(nmi->hContact); ImageList_DrawEx(hCListImages, iIcon, hDC, rc->left, (rc->bottom + rc->top - g_cysmIcon) / 2, g_cxsmIcon, g_cysmIcon, CLR_NONE, CLR_NONE, ILD_NORMAL); rc->left += 18; ImageList_DrawEx(hCListImages, nmi->iIcon, hDC, 4, (rc->bottom + rc->top) / 2 - 8, 16, 16, CLR_NONE, CLR_NONE, ILD_NORMAL); diff --git a/plugins/Clist_nicer/src/clistevents.cpp b/plugins/Clist_nicer/src/clistevents.cpp index d9856cec30..4f3cfee501 100644 --- a/plugins/Clist_nicer/src/clistevents.cpp +++ b/plugins/Clist_nicer/src/clistevents.cpp @@ -118,7 +118,7 @@ LRESULT CALLBACK EventAreaWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa if (GetMenuItemInfoA(cfg::dat.hMenuNotify, (UINT)dis->itemID, FALSE, &mii) != 0) { nmi = (struct NotifyMenuItemExData *) mii.dwItemData; if (nmi) { - iIcon = pcli->pfnGetContactIcon(nmi->hContact); + iIcon = Clist_GetContactIcon(nmi->hContact); hIcon = ImageList_GetIcon(hCListImages, iIcon, ILD_NORMAL); pcli->pfnDrawMenuItem(dis, hIcon, nmi->hIcon); return TRUE; diff --git a/plugins/FavContacts/src/menu.cpp b/plugins/FavContacts/src/menu.cpp index 4770696e65..ea2702ecd9 100644 --- a/plugins/FavContacts/src/menu.cpp +++ b/plugins/FavContacts/src/menu.cpp @@ -242,7 +242,7 @@ static BOOL sttDrawItem_Contact(LPDRAWITEMSTRUCT lpdis, Options *options = nullp char *proto = GetContactProto(hContact); HIMAGELIST hIml = Clist_GetImageList(); - int iIcon = pcli->pfnGetContactIcon(hContact); + int iIcon = Clist_GetContactIcon(hContact); if (db_get_dw(hContact, proto, "IdleTS", 0)) { ImageList_DrawDimmed(hIml, iIcon, hdcTemp, diff --git a/plugins/FloatingContacts/src/thumbs.cpp b/plugins/FloatingContacts/src/thumbs.cpp index 46a593c656..33c49626f9 100644 --- a/plugins/FloatingContacts/src/thumbs.cpp +++ b/plugins/FloatingContacts/src/thumbs.cpp @@ -300,8 +300,8 @@ void ThumbInfo::ResizeThumb() void ThumbInfo::RefreshContactIcon(int _iIcon) { - if (_iIcon == 0xFFFFFFFF || ImageList_GetImageCount(himlMiranda) <= _iIcon) - iIcon = pcli->pfnGetContactIcon(hContact); + if (_iIcon == -1 || ImageList_GetImageCount(himlMiranda) <= _iIcon) + iIcon = Clist_GetContactIcon(hContact); else iIcon = _iIcon; diff --git a/plugins/HistoryPlusPlus/GlobalSearch.pas b/plugins/HistoryPlusPlus/GlobalSearch.pas index 5beb129b1d..05952b571e 100644 --- a/plugins/HistoryPlusPlus/GlobalSearch.pas +++ b/plugins/HistoryPlusPlus/GlobalSearch.pas @@ -532,7 +532,7 @@ begin li.Caption := LastAddedContact.Name; Inc(ContactsFound); end; - li.ImageIndex := cli^.pfnGetContactIcon(CurContact); + li.ImageIndex := Clist_GetContactIcon(CurContact); li.Data := Pointer(CurContact); end; diff --git a/plugins/NewAwaySysMod/src/ContactList.cpp b/plugins/NewAwaySysMod/src/ContactList.cpp index 464a2881cf..a5330645b9 100644 --- a/plugins/NewAwaySysMod/src/ContactList.cpp +++ b/plugins/NewAwaySysMod/src/ContactList.cpp @@ -371,7 +371,7 @@ HTREEITEM CCList::AddContact(MCONTACT hContact) tvIns.item.pszText = pcli->pfnGetContactDisplayName(hContact, 0); tvIns.hInsertAfter = TVI_ROOT; tvIns.item.mask = TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE | TVIF_PARAM; - tvIns.item.iImage = tvIns.item.iSelectedImage = pcli->pfnGetContactIcon(hContact); + tvIns.item.iImage = tvIns.item.iSelectedImage = Clist_GetContactIcon(hContact); tvIns.item.lParam = Items.AddElem(CCLItemData(hContact)); return TreeView_InsertItem(hTreeView, &tvIns); } diff --git a/plugins/QuickContacts/src/quickcontacts.cpp b/plugins/QuickContacts/src/quickcontacts.cpp index 629faddd9a..4b4c689f3c 100644 --- a/plugins/QuickContacts/src/quickcontacts.cpp +++ b/plugins/QuickContacts/src/quickcontacts.cpp @@ -436,7 +436,7 @@ void EnableButtons(HWND hwndDlg, MCONTACT hContact) EnableWindow(GetDlgItem(hwndDlg, IDC_HISTORY), TRUE); EnableWindow(GetDlgItem(hwndDlg, IDC_MENU), TRUE); - HICON ico = ImageList_GetIcon(hIml, pcli->pfnGetContactIcon(hContact), ILD_IMAGE); + HICON ico = ImageList_GetIcon(hIml, Clist_GetContactIcon(hContact), ILD_IMAGE); SendDlgItemMessage(hwndDlg, IDC_ICO, STM_SETICON, (WPARAM)ico, 0); } } @@ -966,7 +966,7 @@ static INT_PTR CALLBACK MainDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA // Draw icon rc.left = lpdis->rcItem.left + 5; rc.top = (lpdis->rcItem.bottom + lpdis->rcItem.top - icon_height) / 2; - ImageList_Draw(hIml, pcli->pfnGetContactIcon(contacts[lpdis->itemData]->hcontact), lpdis->hDC, rc.left, rc.top, ILD_NORMAL); + ImageList_Draw(hIml, Clist_GetContactIcon(contacts[lpdis->itemData]->hcontact), lpdis->hDC, rc.left, rc.top, ILD_NORMAL); // Make rect for text rc.left += icon_width + 5; diff --git a/plugins/QuickSearch/sr_window.pas b/plugins/QuickSearch/sr_window.pas index e1d44f8e11..2aa6e6238c 100644 --- a/plugins/QuickSearch/sr_window.pas +++ b/plugins/QuickSearch/sr_window.pas @@ -123,7 +123,7 @@ begin FillChar(li,SizeOf(li),0); li.iItem :=100000; //!! need append li.mask :=LVIF_IMAGE or LVIF_PARAM; - li.iImage:=cli^.pfnGetContactIcon(hContact); + li.iImage:=Clist_GetContactIcon(hContact); li.lParam:=num; li.iItem :=SendMessageW(grid,LVM_INSERTITEMW,0,lparam(@li)); diff --git a/plugins/RecentContacts/src/RecentContacts.cpp b/plugins/RecentContacts/src/RecentContacts.cpp index 89e281b136..01c1330e71 100644 --- a/plugins/RecentContacts/src/RecentContacts.cpp +++ b/plugins/RecentContacts/src/RecentContacts.cpp @@ -248,7 +248,7 @@ INT_PTR CALLBACK ShowListMainDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM str = _A2T(strtim); str += cname; lvi.pszText = (LPTSTR)str.c_str(); - lvi.iImage = pcli->pfnGetContactIcon(curContact->second); + lvi.iImage = Clist_GetContactIcon(curContact->second); ListView_InsertItem(hList, &lvi); i++; diff --git a/plugins/SeenPlugin/src/missed.cpp b/plugins/SeenPlugin/src/missed.cpp index 8f202e7f61..c24473164e 100644 --- a/plugins/SeenPlugin/src/missed.cpp +++ b/plugins/SeenPlugin/src/missed.cpp @@ -52,7 +52,7 @@ int ResetMissed(void) int CheckIfOnline(void) { for (auto &hContact : Contacts()) - if (pcli->pfnGetContactIcon(hContact) != ICON_OFFLINE) + if (Clist_GetContactIcon(hContact) != ICON_OFFLINE) db_set_b(hContact, S_MOD, "Missed", 2); return 0; diff --git a/plugins/TipperYM/src/popwin.cpp b/plugins/TipperYM/src/popwin.cpp index 9fa2057686..de2d28047b 100644 --- a/plugins/TipperYM/src/popwin.cpp +++ b/plugins/TipperYM/src/popwin.cpp @@ -298,7 +298,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa pwd->iIndent = opt.iTextIndent; pwd->iSidebarWidth = opt.iSidebarWidth; pwd->hContact = (DWORD_PTR)pwd->clcit.hItem; - pwd->iIconIndex = pcli->pfnGetContactIcon(pwd->hContact); + pwd->iIconIndex = Clist_GetContactIcon(pwd->hContact); // don't use stored status message if (!opt.bWaitForContent) -- cgit v1.2.3