- struct GCSESSION died;

- Chat_NewSession simply gets 5 parameters;
- minor chat code cleaning

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

2 files changed, 3 insertions, 14 deletions

diff --git a/protocols/IRCG/src/commandmonitor.cpp b/protocols/IRCG/src/commandmonitor.cpp
index 72788f322b..f47067ee3d 100644
--- a/protocols/IRCG/src/commandmonitor.cpp
+++ b/protocols/IRCG/src/commandmonitor.cpp
@@ -1266,14 +1266,7 @@ bool CIrcProto::OnIrc_ENDNAMES(const CIrcMessage* pmsg)
 			CMStringW sID = MakeWndID(sChanName);

 			BYTE btOwnMode = 0;

 

-			GCSESSION gcw = {};

-			gcw.iType = GCW_CHATROOM;

-			gcw.ptszID = sID;

-			gcw.pszModule = m_szModuleName;

-			gcw.ptszName = sChanName;

-			if (!Chat_NewSession(&gcw)) {

-				DBVARIANT dbv;

-

+			if (!Chat_NewSession(GCW_CHATROOM, m_szModuleName, sID, sChanName)) {

 				PostIrcMessage(L"/MODE %s", sChanName);

 

 				// register the statuses

@@ -1359,6 +1352,7 @@ bool CIrcProto::OnIrc_ENDNAMES(const CIrcMessage* pmsg)
 					}

 				}

 

+				DBVARIANT dbv;

 				if (!getWString("JTemp", &dbv)) {

 					CMStringW command = L"a";

 					CMStringW save = L"";

diff --git a/protocols/IRCG/src/ircproto.cpp b/protocols/IRCG/src/ircproto.cpp
index f80950ae5f..b0faf81af6 100644
--- a/protocols/IRCG/src/ircproto.cpp
+++ b/protocols/IRCG/src/ircproto.cpp
@@ -204,12 +204,7 @@ int CIrcProto::OnModulesLoaded(WPARAM, LPARAM)
 	HookProtoEvent(ME_GC_EVENT, &CIrcProto::GCEventHook);

 	HookProtoEvent(ME_GC_BUILDMENU, &CIrcProto::GCMenuHook);

 

-	GCSESSION gcw = {};

-	gcw.iType = GCW_SERVER;

-	gcw.ptszID = SERVERWINDOW;

-	gcw.pszModule = m_szModuleName;

-	gcw.ptszName = NEWWSTR_ALLOCA((wchar_t*)_A2T(m_network));

-	Chat_NewSession(&gcw);

+	Chat_NewSession(GCW_SERVER, m_szModuleName, SERVERWINDOW, _A2T(m_network));

 

 	if (m_useServer && !m_hideServerWindow)

 		Chat_Control(m_szModuleName, SERVERWINDOW, WINDOW_VISIBLE);