Group chats:

- GC_CONTROL_MSG left us forever;
- tons of old/unused/useless slack simply wiped out;
- new function: CSrmmBaseDialog::ClearLog

2 files changed, 3 insertions, 5 deletions

diff --git a/include/m_chat.h b/include/m_chat.h
index 8f08551931..93679fb1e1 100644
--- a/include/m_chat.h
+++ b/include/m_chat.h
@@ -415,8 +415,6 @@ EXTERN_C MIR_APP_DLL(int) Chat_SetStatusEx(const char *szModule, const wchar_t *
 

 #define WINDOW_VISIBLE			2   // make the room window visible

 #define WINDOW_HIDDEN			3   // close the room window. Session is not terminated.

-#define WINDOW_MAXIMIZE			4   // make the room window maximized

-#define WINDOW_MINIMIZE			5   // make the room window minimized

 #define WINDOW_CLEARLOG			6   // clear the log of the room window

 

 // if wszId == NULL, this message is broadcasted to all windows of specified szModule

diff --git a/include/m_chat_int.h b/include/m_chat_int.h
index 5ca6c8f021..7cf9a6e062 100644
--- a/include/m_chat_int.h
+++ b/include/m_chat_int.h
@@ -51,7 +51,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define GC_FILTERFIX           (WM_USER+111)

 #define GC_CHANGEFILTERFLAG    (WM_USER+112)

 #define GC_SHOWFILTERMENU      (WM_USER+113)

-#define GC_CONTROL_MSG         (WM_USER+116)

 #define GC_REDRAWWINDOW        (WM_USER+118)

 #define GC_SHOWCOLORCHOOSER    (WM_USER+119)

 #define GC_ADDLOG              (WM_USER+120)

@@ -287,8 +286,7 @@ struct CHAT_MANAGER
 {

 	CHAT_MANAGER();

 

-	void          (*SetActiveSession)(const wchar_t *pszID, const char *pszModule);

-	void          (*SetActiveSessionEx)(SESSION_INFO *si);

+	void          (*SetActiveSession)(SESSION_INFO *si);

 	SESSION_INFO* (*GetActiveSession)(void);

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

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

@@ -431,6 +429,8 @@ public:
 	bool m_bFGSet, m_bBGSet;

 	COLORREF m_iFG, m_iBG;

 

+	void ClearLog();

+

 	__forceinline bool isChat() const { return m_si != nullptr; }

 

 	__inline void* operator new(size_t size){ return calloc(1, size); }