kernel chat engine, part 2 - scriver

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

3 files changed, 18 insertions, 13 deletions

diff --git a/include/m_chat_int.h b/include/m_chat_int.h
index b98bc2cfc1..089eef15b3 100644
--- a/include/m_chat_int.h
+++ b/include/m_chat_int.h
@@ -27,6 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_chat.h>

 

 #define OPTIONS_FONTCOUNT 17

+#define STATUSICONCOUNT 6

 

 #define GC_UPDATETITLE         (WM_USER+100)

 #define GC_SPLITTERMOVED       (WM_USER+101)

@@ -105,13 +106,15 @@ struct GCModuleInfoBase
 	char*     pszModule;

 	TCHAR*    ptszModDispName;

 	char*     pszHeader;

-	BOOL      bBold;

-	BOOL      bUnderline;

-	BOOL      bItalics;

-	BOOL      bColor;

-	BOOL      bBkgColor;

-	BOOL      bChanMgr;

-	BOOL      bAckMsg;

+	bool      bBold;

+	bool      bUnderline;

+	bool      bItalics;

+	bool      bColor;

+	bool      bBkgColor;

+	bool      bChanMgr;

+	bool      bAckMsg;

+	bool      bSingleFormat;

+	bool      bFontSize;

 	int       nColorCount;

 	COLORREF* crColors;

 	HICON     hOnlineIcon;

@@ -353,11 +356,11 @@ struct CHAT_MANAGER
 	BOOL          (*LM_TrimLog)(LOGINFO** ppLogListStart, LOGINFO** ppLogListEnd, int iCount);

 	BOOL          (*LM_RemoveAll)(LOGINFO** ppLogListStart, LOGINFO** ppLogListEnd);

 

-	HANDLE        (*AddRoom)(const char *pszModule, const TCHAR* pszRoom, const TCHAR* pszDisplayName, int iType);

+	HANDLE        (*AddRoom)(const char *pszModule, const TCHAR *pszRoom, const TCHAR *pszDisplayName, int iType);

 	BOOL          (*SetOffline)(HANDLE hContact, BOOL bHide);

 	BOOL          (*SetAllOffline)(BOOL bHide, const char *pszModule);

 	BOOL          (*AddEvent)(HANDLE hContact, HICON hIcon, HANDLE hEvent, int type, TCHAR* fmt, ...);

-	HANDLE        (*FindRoom)(const char *pszModule, const TCHAR* pszRoom);

+	HANDLE        (*FindRoom)(const char *pszModule, const TCHAR *pszRoom);

 	void          (*ShowRoom)(SESSION_INFO *si, WPARAM wp, BOOL bSetForeground);

 

 	char*         (*Log_CreateRTF)(LOGSTREAMDATA *streamData);

@@ -397,6 +400,8 @@ struct CHAT_MANAGER
 	char      *szActiveWndModule;

 	int        logPixelSY, logPixelSX;

 	int        cbModuleInfo, cbSession;

+	

+	SESSION_INFO *wndList;

 };

 

 extern CHAT_MANAGER ci, *pci;

diff --git a/include/m_clistint.h b/include/m_clistint.h
index b0d49e935e..8cda5111f7 100644
--- a/include/m_clistint.h
+++ b/include/m_clistint.h
@@ -178,7 +178,7 @@ struct trayIconInfo_t
 

 typedef struct _menuProto

 {

-	char* szProto; //This is DLL-based unique name

+	char *szProto; //This is DLL-based unique name

 	HGENMENU pMenu;

 	HICON hIcon;

 }

@@ -366,7 +366,7 @@ typedef struct
 	/* clui.c */

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

 

-	void (*pfnCluiProtocolStatusChanged)(int status, const char* szProto);

+	void (*pfnCluiProtocolStatusChanged)(int status, const char *szProto);

 	void (*pfnDrawMenuItem)(LPDRAWITEMSTRUCT, HICON, HICON);

 	void (*pfnLoadCluiGlobalOpts)(void);

 	BOOL (*pfnInvalidateRect)(HWND hwnd, CONST RECT* lpRect, BOOL bErase);

diff --git a/include/m_db_int.h b/include/m_db_int.h
index 2d07e67896..dbaaa77076 100644
--- a/include/m_db_int.h
+++ b/include/m_db_int.h
@@ -72,8 +72,8 @@ interface MIDatabase
 	STDMETHOD_(void,SetCacheSafetyMode)(BOOL) PURE;

 

 	STDMETHOD_(LONG,GetContactCount)(void) PURE;

-	STDMETHOD_(HANDLE,FindFirstContact)(const char* szProto = NULL) PURE;

-	STDMETHOD_(HANDLE,FindNextContact)(HANDLE hContact, const char* szProto = NULL) PURE;

+	STDMETHOD_(HANDLE,FindFirstContact)(const char *szProto = NULL) PURE;

+	STDMETHOD_(HANDLE,FindNextContact)(HANDLE hContact, const char *szProto = NULL) PURE;

 

 	STDMETHOD_(LONG,DeleteContact)(HANDLE hContact) PURE;

 	STDMETHOD_(HANDLE,AddContact)(void) PURE;