chat code reordering

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

2 files changed, 1 insertions, 19 deletions

diff --git a/include/m_chat.h b/include/m_chat.h
index d8236f3971..c94b2fa26d 100644
--- a/include/m_chat.h
+++ b/include/m_chat.h
@@ -405,6 +405,7 @@ EXTERN_C MIR_APP_DLL(int) Chat_SetStatusbarText(const char *szModule, const wcha
 #define GC_SSE_TABDELIMITED   0x0004  // use tabs as delimiters

 #define GC_SSE_OFFLINE        0x0008  // displays a contact offline, otherwise away

 

+// if wszId == NULL, the status is applied to all windows of specified szModule

 EXTERN_C MIR_APP_DLL(int) Chat_SetStatusEx(const char *szModule, const wchar_t *wszId, int flags, const wchar_t *wszText);

 

 /////////////////////////////////////////////////////////////////////////////////////////

diff --git a/include/m_chat_int.h b/include/m_chat_int.h
index e8e56c654d..6aa36ebfd4 100644
--- a/include/m_chat_int.h
+++ b/include/m_chat_int.h
@@ -304,35 +304,16 @@ struct CHAT_MANAGER
 	void          (*SetActiveSession)(const wchar_t *pszID, const char *pszModule);

 	void          (*SetActiveSessionEx)(SESSION_INFO *si);

 	SESSION_INFO* (*GetActiveSession)(void);

-	SESSION_INFO* (*SM_AddSession)(const wchar_t *pszID, const char *pszModule);

-	int           (*SM_RemoveSession)(const wchar_t *pszID, const char *pszModule, BOOL removeContact);

 	SESSION_INFO* (*SM_FindSession)(const wchar_t *pszID, const char *pszModule);

-	USERINFO*     (*SM_AddUser)(const wchar_t *pszID, const char *pszModule, const wchar_t *pszUID, const wchar_t *pszNick, WORD wStatus);

-	BOOL          (*SM_ChangeUID)(const wchar_t *pszID, const char *pszModule, const wchar_t *pszUID, const wchar_t* pszNewUID);

-	BOOL          (*SM_ChangeNick)(const wchar_t *pszID, const char *pszModule, GCEVENT *gce);

-	BOOL          (*SM_RemoveUser)(const wchar_t *pszID, const char *pszModule, const wchar_t *pszUID);

-	BOOL          (*SM_SetOffline)(const wchar_t *pszID, const char *pszModule);

-	BOOL          (*SM_SetTabbedWindowHwnd)(SESSION_INFO *si, HWND hwnd);

 	HICON         (*SM_GetStatusIcon)(SESSION_INFO *si, USERINFO * ui);

-	BOOL          (*SM_SetStatus)(const wchar_t *pszID, const char *pszModule, int wStatus);

-	BOOL          (*SM_SetStatusEx)(const wchar_t *pszID, const char *pszModule, const wchar_t* pszText, int flags);

-	BOOL          (*SM_SendUserMessage)(const wchar_t *pszID, const char *pszModule, const wchar_t* pszText);

-	STATUSINFO*   (*SM_AddStatus)(const wchar_t *pszID, const char *pszModule, const wchar_t *pszStatus);

 	BOOL          (*SM_AddEvent)(const wchar_t *pszID, const char *pszModule, GCEVENT *gce, BOOL bIsHighlighted);

-	LRESULT       (*SM_SendMessage)(const wchar_t *pszID, const char *pszModule, UINT msg, WPARAM wParam, LPARAM lParam);

 	BOOL          (*SM_PostMessage)(const wchar_t *pszID, const char *pszModule, UINT msg, WPARAM wParam, LPARAM lParam);

 	BOOL          (*SM_BroadcastMessage)(const char *pszModule, UINT msg, WPARAM wParam, LPARAM lParam, BOOL bAsync);

-	BOOL          (*SM_RemoveAll)(void);

-	BOOL          (*SM_GiveStatus)(const wchar_t *pszID, const char *pszModule, const wchar_t *pszUID, const wchar_t *pszStatus);

-	BOOL          (*SM_SetContactStatus)(const wchar_t *pszID, const char *pszModule, const wchar_t *pszUID, WORD pszStatus);

-	BOOL          (*SM_TakeStatus)(const wchar_t *pszID, const char *pszModule, const wchar_t *pszUID, const wchar_t *pszStatus);

-	BOOL          (*SM_MoveUser)(const wchar_t *pszID, const char *pszModule, const wchar_t *pszUID);

 	void          (*SM_AddCommand)(const wchar_t *pszID, const char *pszModule, const char* lpNewCommand);

 	char*         (*SM_GetPrevCommand)(const wchar_t *pszID, const char *pszModule);

 	char*         (*SM_GetNextCommand)(const wchar_t *pszID, const char *pszModule);

 	int           (*SM_GetCount)(const char *pszModule);

 	SESSION_INFO* (*SM_FindSessionByIndex)(const char *pszModule, int iItem);

-	char*         (*SM_GetUsers)(SESSION_INFO *si);

 	USERINFO*     (*SM_GetUserFromIndex)(const wchar_t *pszID, const char *pszModule, int index);

 	void          (*SM_InvalidateLogDirectories)(void);