massive code cleaning:

- GCHOOK structure normalized (i.e. inlined SESSION_INFO fields replaced with a reference to SESSION_INFO);
- fake CMsgDialog declaration added to m_srmm_int.h, thus duplicated declarations in plugins aren't needed anymore
- other minor changes

2 files changed, 6 insertions, 4 deletions

diff --git a/include/m_chat.h b/include/m_chat.h
index 6ea7a048ba..d3b91c1e3d 100644
--- a/include/m_chat.h
+++ b/include/m_chat.h
@@ -477,16 +477,13 @@ EXTERN_C MIR_APP_DLL(int) Chat_GetInfo(GC_INFO*);
 

 struct GCHOOK

 {

-	LPCSTR  pszModule;   // Name of the protocol (same as you registered with)

-	LPCTSTR ptszID;      // Unique identifier of the session, or NULL to broadcast to all sessions as specified above

 	int     iType;       // Use GC_EVENT_* as defined above. Only one event per service call.

-	

 	LPTSTR  ptszText;    // usage depends on type of event

 	LPTSTR  ptszUID;     // unique identifier, usage depends on type of event

 	LPTSTR  ptszNick;    // user nick, as displayed in a nicklist

 	INT_PTR dwData;      // user defined data, usage depends on type of event

 

-	class CSrmmBaseDialog *pDlg; // dialog from which this event was called

+	SESSION_INFO *si;    // session information

 };

 

 /*

diff --git a/include/m_srmm_int.h b/include/m_srmm_int.h
index 291a95a71a..3bf29fc7d1 100644
--- a/include/m_srmm_int.h
+++ b/include/m_srmm_int.h
@@ -249,9 +249,14 @@ public:
 	virtual LRESULT WndProc_Nicklist(UINT msg, WPARAM wParam, LPARAM lParam);
 
 	__forceinline bool isChat() const { return m_si != nullptr; }
+	__forceinline CSrmmLogWindow *log() const { return m_pLog; }
 
 	__inline void *operator new(size_t size) { return calloc(1, size); }
 	__inline void operator delete(void *p) { free(p); }
 };
 
+#ifndef SRMM_OWN_STRUCTURES
+class CMsgDialog : public CSrmmBaseDialog {};
+#endif 
+
 #endif // M_MESSAGE_H__