From 31b191bc8ddb639e488ab8306f71ac1dbabf16f0 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 3 Nov 2012 17:32:37 +0000 Subject: removing built-in Clist Modern extra icons part I git-svn-id: http://svn.miranda-ng.org/main/trunk@2167 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/IcqOscarJ/src/icq_proto.cpp | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) (limited to 'protocols/IcqOscarJ/src/icq_proto.cpp') diff --git a/protocols/IcqOscarJ/src/icq_proto.cpp b/protocols/IcqOscarJ/src/icq_proto.cpp index 77f86c6133..cf91ecb38d 100644 --- a/protocols/IcqOscarJ/src/icq_proto.cpp +++ b/protocols/IcqOscarJ/src/icq_proto.cpp @@ -32,7 +32,6 @@ #include "m_icolib.h" extern PLUGININFOEX pluginInfo; -extern HANDLE hExtraXStatus; #pragma warning(disable:4355) @@ -340,25 +339,14 @@ int CIcqProto::OnModulesLoaded( WPARAM wParam, LPARAM lParam ) InitPopUps(); InitXStatusItems(FALSE); - if (hExtraXStatus == NULL) + HANDLE hContact = FindFirstContact(); + while (hContact != NULL) { - if (HookProtoEvent(ME_CLIST_EXTRA_LIST_REBUILD, &CIcqProto::CListMW_ExtraIconsRebuild)) - { // note if the Hook was successful (e.g. clist_nicer creates them too late) - HookProtoEvent(ME_CLIST_EXTRA_IMAGE_APPLY, &CIcqProto::CListMW_ExtraIconsApply); - bXStatusExtraIconsReady = 1; - } - } - else - { - HANDLE hContact = FindFirstContact(); - while (hContact != NULL) - { - DWORD bXStatus = getContactXStatus(hContact); - if (bXStatus > 0) - setContactExtraIcon(hContact, bXStatus); + DWORD bXStatus = getContactXStatus(hContact); + if (bXStatus > 0) + setContactExtraIcon(hContact, bXStatus); - hContact = FindNextContact(hContact); - } + hContact = FindNextContact(hContact); } return 0; -- cgit v1.2.3