- one more crash fix;

- cache functionality fixed;
- strange type 'boolean' removed
- all header files included into project

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

4 files changed, 39 insertions, 47 deletions

diff --git a/plugins/Clist_modern/hdr/modern_clist.h b/plugins/Clist_modern/hdr/modern_clist.h
index 1c1d34ee02..f82e4c75bd 100644
--- a/plugins/Clist_modern/hdr/modern_clist.h
+++ b/plugins/Clist_modern/hdr/modern_clist.h
@@ -76,41 +76,42 @@ public:
 

 };

 

-struct tag_DNCE{

-	HANDLE	m_cache_hContact;

-	TCHAR*	m_cache_tcsName;

-#if defined( _UNICODE )

-	char*	m_cache_szName;

-#endif

-	TCHAR*	m_cache_tcsGroup;

-	int		m_cache_nHidden;

-	int		m_cache_nNoHiddenOffline;

-

-	char*	m_cache_cszProto;

-	boolean m_cache_bProtoNotExists;

-	int		m_cache_nStatus;

-	int		m_cache_nHiddenSubcontact;

-

-	int		i;

-	int		ApparentMode;

-	int		NotOnList;

-	int		IdleTS;

-	void*	ClcContact;

-	BYTE	IsExpanded;

-	boolean isUnknown;

-

-	TCHAR	*	szSecondLineText;

+struct tag_DNCE

+{

+	HANDLE   m_cache_hContact;

+	TCHAR*   m_cache_tcsName;

+

+	TCHAR*   m_cache_tcsGroup;

+	int      m_cache_nHidden;

+	int      m_cache_nNoHiddenOffline;

+

+	char*    m_cache_cszProto;

+	bool     m_cache_bProtoNotExists;

+	int      m_cache_nStatus;

+	int      m_cache_nHiddenSubcontact;

+

+	int      i;

+	int      ApparentMode;

+	int      NotOnList;

+	int      IdleTS;

+	void*    ClcContact;

+	BYTE     IsExpanded;

+	bool     isUnknown;

+

+	TCHAR*   szSecondLineText;

 	CSmileyString ssSecondLine;

 

-	TCHAR	*	szThirdLineText;

+	TCHAR*   szThirdLineText;

 	CSmileyString ssThirdLine;

 

-	HANDLE	hTimeZone;

-	DWORD	dwLastMsgTime;

-};

-typedef tag_DNCE displayNameCacheEntry,*pdisplayNameCacheEntry, *PDNCE;

+	HANDLE   hTimeZone;

+	DWORD    dwLastMsgTime;

 

+	void     getName(void);

+	void     freeName(void);

+};

 

+typedef tag_DNCE displayNameCacheEntry,*pdisplayNameCacheEntry, *PDNCE;

 

 typedef struct tagEXTRASLOTINFO

 {

diff --git a/plugins/Clist_modern/hdr/modern_commonheaders.h b/plugins/Clist_modern/hdr/modern_commonheaders.h
index 86f649df78..6b32f8e74b 100644
--- a/plugins/Clist_modern/hdr/modern_commonheaders.h
+++ b/plugins/Clist_modern/hdr/modern_commonheaders.h
@@ -173,20 +173,14 @@ extern char *g_szMetaModuleName;
 #define SCF_TOP     3

 #define SCF_BOTTOM  6

 

-

-extern char* __cdecl strstri( char *a, const char *b);

-extern BOOL __cdecl mir_bool_strcmpi(const char *a, const char *b);

-extern int __cdecl mir_strcmp (const char *a, const char *b);

-extern int __cdecl mir_strlen (const char *a);

-extern int __cdecl mir_strcmpi(const char *a, const char *b);

-extern int __cdecl mir_tstrcmpi(const TCHAR *a, const TCHAR *b);

-extern BOOL __cdecl mir_bool_tstrcmpi(const TCHAR *a, const TCHAR *b);

-extern DWORD exceptFunction(LPEXCEPTION_POINTERS EP);

-

-extern HANDLE ModernHookEvent( char *EventID, MIRANDAHOOK HookProc );

-

-extern int ModernUnhookEvent(HANDLE hHook);

-extern int UnhookAll();

+char* __cdecl strstri( char *a, const char *b);

+BOOL __cdecl mir_bool_strcmpi(const char *a, const char *b);

+int __cdecl mir_strcmp (const char *a, const char *b);

+int __cdecl mir_strlen (const char *a);

+int __cdecl mir_strcmpi(const char *a, const char *b);

+int __cdecl mir_tstrcmpi(const TCHAR *a, const TCHAR *b);

+BOOL __cdecl mir_bool_tstrcmpi(const TCHAR *a, const TCHAR *b);

+DWORD exceptFunction(LPEXCEPTION_POINTERS EP);

 

 #ifndef MYCMP

 #define MYCMP 1

diff --git a/plugins/Clist_modern/hdr/modern_commonprototypes.h b/plugins/Clist_modern/hdr/modern_commonprototypes.h
index 91ca540fd9..58cd28c7a9 100644
--- a/plugins/Clist_modern/hdr/modern_commonprototypes.h
+++ b/plugins/Clist_modern/hdr/modern_commonprototypes.h
@@ -104,7 +104,7 @@ INT_PTR	CLUI_GetConnectingIconService(WPARAM wParam,LPARAM lParam);
 int		CLUI_HideBehindEdge();

 int		CLUI_IconsChanged(WPARAM,LPARAM);

 int		CLUI_IsInMainWindow(HWND hwnd);

-HICON	CLUI_LoadIconFromExternalFile (char *filename,int i,boolean UseLibrary,boolean registerit,char *IconName,char *SectName,char *Description,int internalidx, BOOL * needFree);

+HICON	CLUI_LoadIconFromExternalFile (char *filename,int i,BOOL UseLibrary,bool registerit,char *IconName,char *SectName,char *Description,int internalidx, BOOL * needFree);

 int		CLUI_OnSkinLoad(WPARAM wParam, LPARAM lParam);

 int		CLUI_ReloadCLUIOptions();

 int		CLUI_ShowFromBehindEdge();

diff --git a/plugins/Clist_modern/hdr/modern_static_clui.h b/plugins/Clist_modern/hdr/modern_static_clui.h
index e03008951b..f54fae26c4 100644
--- a/plugins/Clist_modern/hdr/modern_static_clui.h
+++ b/plugins/Clist_modern/hdr/modern_static_clui.h
@@ -185,9 +185,6 @@ static HANDLE hRenameMenuItem,
               hShowAvatarMenuItem,
               hHideAvatarMenuItem;
 
-
-static HANDLE hSettingChangedHook=NULL;
-
 static UINT uMsgGetProfile=0;
 
 static int nLastRequiredHeight=0,