- clist_modern: we don't redeclare code services anymore;

- new CLIST_INTERFACE member: pfnGetContactIcon
- code cleaning

git-svn-id: http://svn.miranda-ng.org/main/trunk@4898 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

2 files changed, 1 insertions, 2 deletions

diff --git a/plugins/Clist_modern/src/hdr/modern_clist.h b/plugins/Clist_modern/src/hdr/modern_clist.h
index 6a62ea3924..9e44332162 100644
--- a/plugins/Clist_modern/src/hdr/modern_clist.h
+++ b/plugins/Clist_modern/src/hdr/modern_clist.h
@@ -26,7 +26,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define _CLIST_H_

 

 void LoadContactTree(void);

-int ExtIconFromStatusMode(HANDLE hContact, const char *szProto,int status);

 HTREEITEM GetTreeItemByHContact(HANDLE hContact);

 void cli_ChangeContactIcon(HANDLE hContact,int iIcon,int add);

 int GetContactInfosForSort(HANDLE hContact,char **Proto,TCHAR **Name,int *Status);

diff --git a/plugins/Clist_modern/src/hdr/modern_commonprototypes.h b/plugins/Clist_modern/src/hdr/modern_commonprototypes.h
index 9b2970ec06..19f2d1d3d2 100644
--- a/plugins/Clist_modern/src/hdr/modern_commonprototypes.h
+++ b/plugins/Clist_modern/src/hdr/modern_commonprototypes.h
@@ -220,7 +220,6 @@ int     ClcDoProtoAck(HANDLE wParam,ACKDATA * ack);
 int     ModernSkinButtonDeleteAll();                                                   //modernbutton.c

 int     GetAverageMode( void );                                                   //clisttray.c

 int     GetContactCachedStatus(HANDLE hContact);                                 //clistsettings.c

-INT_PTR GetContactIcon(WPARAM wParam,LPARAM lParam);                              //clistmod.c

 int     GetContactIconC(ClcCacheEntry *cacheEntry);                           //clistmod.c

 int     GetContactIndex(ClcGroup *group,ClcContact *contact);               //clcidents.c

 int     GetStatusForContact(HANDLE hContact,char *szProto);                           //clistsettings.c

@@ -287,6 +286,7 @@ int     cliGetGroupContentsCount(ClcGroup *group, int visibleOnly);
 int     cliFindRowByText(HWND hwnd, ClcData *dat, const TCHAR *text, int prefixOk);

 int     cliGetRowsPriorTo(ClcGroup *group,ClcGroup *subgroup,int contactIndex);

 int     cli_IconFromStatusMode(const char *szProto,int nStatus, HANDLE hContact);

+int     cli_GetContactIcon(HANDLE hContact);

 int     cli_RemoveEvent(HANDLE hContact, HANDLE hDbEvent);

 void    cli_AddContactToTree(HWND hwnd,ClcData *dat,HANDLE hContact,int updateTotalCount,int checkHideOffline);

 void    cli_DeleteItemFromTree(HWND hwnd, HANDLE hItem);