From 794fa3fb5cc63ac9b69908bd04f4be985a4a8cd1 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 10 Aug 2013 13:28:49 +0000 Subject: - unused services MS_FP_SAMECLIENTS & MS_FP_GETCLIENTICON removed; - Finger_IsSameClents & Finger_GetClientIcon helpers added; - unused code removed from FingerPrint or replaced with the calls from mir_core.dll git-svn-id: http://svn.miranda-ng.org/main/trunk@5632 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/JabberG/src/jabber_menu.cpp | 2 +- protocols/JabberG/src/jabber_userinfo.cpp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'protocols/JabberG/src') diff --git a/protocols/JabberG/src/jabber_menu.cpp b/protocols/JabberG/src/jabber_menu.cpp index 10a8deb480..15e49613df 100644 --- a/protocols/JabberG/src/jabber_menu.cpp +++ b/protocols/JabberG/src/jabber_menu.cpp @@ -456,7 +456,7 @@ int CJabberProto::OnPrebuildContactMenu(WPARAM wParam, LPARAM) if (ServiceExists(MS_FP_GETCLIENTICONT)) { clmi.flags |= CMIM_ICON; FormatMirVer(r, szTmp, SIZEOF(szTmp)); - clmi.hIcon = (HICON)CallService(MS_FP_GETCLIENTICONT, (WPARAM)szTmp, 0); + clmi.hIcon = Finger_GetClientIcon(szTmp, 0); } mir_sntprintf(szTmp, SIZEOF(szTmp), _T("%s [%s, %d]"), r->resourceName, pcli->pfnGetStatusModeDescription(r->status, 0), r->priority); clmi.ptszName = szTmp; diff --git a/protocols/JabberG/src/jabber_userinfo.cpp b/protocols/JabberG/src/jabber_userinfo.cpp index f8a6852bb5..21891faae6 100644 --- a/protocols/JabberG/src/jabber_userinfo.cpp +++ b/protocols/JabberG/src/jabber_userinfo.cpp @@ -228,8 +228,9 @@ static void sttFillResourceInfo(CJabberProto *ppro, HWND hwndTree, HTREEITEM hti if (ServiceExists(MS_FP_GETCLIENTICONT)) { if (res->software != NULL) { mir_sntprintf(buf, SIZEOF(buf), _T("%s %s"), res->software, res->version); - hIcon = (HICON)CallService(MS_FP_GETCLIENTICONT, (WPARAM)buf, 0); - } } + hIcon = Finger_GetClientIcon(buf, 0); + } + } sttFillInfoLine(hwndTree, htiResource, hIcon, TranslateT("Software"), res->software ? res->software : TranslateT(""), -- cgit v1.2.3