clist_nicer: option to display xStatus icon instead of a usual one doesn't work

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

1 files changed, 17 insertions, 16 deletions

diff --git a/plugins/Clist_nicer/src/init.cpp b/plugins/Clist_nicer/src/init.cpp
index bd087c7b0a..b657100533 100644
--- a/plugins/Clist_nicer/src/init.cpp
+++ b/plugins/Clist_nicer/src/init.cpp
@@ -54,39 +54,39 @@ int  GetWindowVisibleState(HWND hWnd, int iStepX, int iStepY);
 int  ShowHide(WPARAM wParam, LPARAM lParam);

 int  ClcShutdown(WPARAM wParam, LPARAM lParam);

 

-void ( *saveLoadClcOptions )(HWND hwnd,struct ClcData *dat);

-void LoadClcOptions(HWND hwnd,struct ClcData *dat);

+void (*saveLoadClcOptions)(HWND hwnd, struct ClcData *dat);

+void LoadClcOptions(HWND hwnd, struct ClcData *dat);

 

-int ( *saveAddContactToGroup )(struct ClcData *dat, ClcGroup *group, HANDLE hContact);

+int (*saveAddContactToGroup)(struct ClcData *dat, ClcGroup *group, HANDLE hContact);

 int AddContactToGroup(struct ClcData *dat, ClcGroup *group, HANDLE hContact);

 

-struct CListEvent* ( *saveAddEvent )(CLISTEVENT *cle);

-struct CListEvent* AddEvent(CLISTEVENT *cle);

+CListEvent* (*saveAddEvent)(CLISTEVENT *cle);

+CListEvent* AddEvent(CLISTEVENT *cle);

 

-int ( *saveAddInfoItemToGroup )(ClcGroup *group, int flags, const TCHAR *pszText);

+int (*saveAddInfoItemToGroup)(ClcGroup *group, int flags, const TCHAR *pszText);

 int AddInfoItemToGroup(ClcGroup *group, int flags, const TCHAR *pszText);

 

-ClcGroup* ( *saveAddGroup )(HWND hwnd, struct ClcData *dat, const TCHAR *szName, DWORD flags, int groupId, int calcTotalMembers);

+ClcGroup* (*saveAddGroup)(HWND hwnd, struct ClcData *dat, const TCHAR *szName, DWORD flags, int groupId, int calcTotalMembers);

 ClcGroup* AddGroup(HWND hwnd, struct ClcData *dat, const TCHAR *szName, DWORD flags, int groupId, int calcTotalMembers);

 

-LRESULT ( CALLBACK *saveContactListWndProc )(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);

+LRESULT (CALLBACK *saveContactListWndProc)(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);

 LRESULT CALLBACK ContactListWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);

 

-LRESULT ( CALLBACK *saveContactListControlWndProc )(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);

+LRESULT (CALLBACK *saveContactListControlWndProc)(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);

 LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);

 

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

+int (*saveIconFromStatusMode)(const char *szProto, int status, HANDLE hContact);

 

-LRESULT ( *saveProcessExternalMessages )(HWND hwnd, struct ClcData *dat, UINT msg, WPARAM wParam, LPARAM lParam);

+LRESULT(*saveProcessExternalMessages)(HWND hwnd, struct ClcData *dat, UINT msg, WPARAM wParam, LPARAM lParam);

 LRESULT ProcessExternalMessages(HWND hwnd, struct ClcData *dat, UINT msg, WPARAM wParam, LPARAM lParam);

 

-int ( *saveRemoveEvent )(HANDLE hContact, HANDLE hDbEvent);

+int (*saveRemoveEvent)(HANDLE hContact, HANDLE hDbEvent);

 int RemoveEvent(HANDLE hContact, HANDLE hDbEvent);

 

-INT_PTR ( *saveTrayIconProcessMessage )(WPARAM wParam, LPARAM lParam);

+INT_PTR (*saveTrayIconProcessMessage)(WPARAM wParam, LPARAM lParam);

 INT_PTR TrayIconProcessMessage(WPARAM wParam, LPARAM lParam);

 

-void ( *saveRecalcScrollBar )(HWND hwnd, struct ClcData *dat);

+void (*saveRecalcScrollBar)(HWND hwnd, struct ClcData *dat);

 void RecalcScrollBar(HWND hwnd, struct ClcData *dat);

 

 PLUGININFOEX pluginInfo =

@@ -194,8 +194,9 @@ static int systemModulesLoaded(WPARAM wParam, LPARAM lParam)
 	return 0;

 }

 

-static int fnIconFromStatusMode( const char* szProto, int status, HANDLE hContact )

-{	return IconFromStatusMode( szProto, status, hContact, NULL );

+static int fnIconFromStatusMode(const char* szProto, int status, HANDLE hContact)

+{

+	return IconFromStatusMode(szProto, status, hContact, NULL);

 }

 

 extern "C" int __declspec(dllexport) CListInitialise()