From 05cd7934d4bdb097e112efdda356946868f3f5d6 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Wed, 8 Jan 2014 19:39:48 +0000
Subject: - end of ANSI support in chats; - manual crit section control removed
 from chat engine; - bunch of memory-related clutches either removed or
 replaced with smart pointers

git-svn-id: http://svn.miranda-ng.org/main/trunk@7549 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/AimOscar/src/chat.cpp | 38 +++++++++++---------------------------
 1 file changed, 11 insertions(+), 27 deletions(-)

(limited to 'protocols/AimOscar')

diff --git a/protocols/AimOscar/src/chat.cpp b/protocols/AimOscar/src/chat.cpp
index 1c9f329486..f58f824016 100644
--- a/protocols/AimOscar/src/chat.cpp
+++ b/protocols/AimOscar/src/chat.cpp
@@ -21,13 +21,11 @@ static const COLORREF crCols[16] = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15};
 
 void CAimProto::chat_register(void)
 {
-	GCREGISTER gcr = {0};
-	gcr.cbSize = sizeof(gcr);
-	gcr.dwFlags = GC_TYPNOTIF | GC_CHANMGR | GC_TCHAR;
-	gcr.iMaxText = 0;
+	GCREGISTER gcr = { sizeof(gcr) };
+	gcr.dwFlags = GC_TYPNOTIF | GC_CHANMGR;
 	gcr.nColors = 16;
 	gcr.pColors = (COLORREF*)crCols;
-	gcr.ptszModuleDispName = m_tszUserName;
+	gcr.ptszDispName = m_tszUserName;
 	gcr.pszModule = m_szModuleName;
 	CallServiceSync(MS_GC_REGISTER, 0, (LPARAM)&gcr);
 
@@ -39,22 +37,15 @@ void CAimProto::chat_start(const char* id, unsigned short exchange)
 {
 	TCHAR* idt = mir_a2t(id);
 
-	GCSESSION gcw = {0};
-	gcw.cbSize = sizeof(gcw);
-	gcw.dwFlags = GC_TCHAR;
+	GCSESSION gcw = { sizeof(gcw) };
 	gcw.iType = GCW_CHATROOM;
 	gcw.pszModule = m_szModuleName;
 	gcw.ptszName = idt;
 	gcw.ptszID = idt;
 	CallServiceSync(MS_GC_NEWSESSION, 0, (LPARAM)&gcw);
 
-	GCDEST gcd = { m_szModuleName, { NULL }, GC_EVENT_ADDGROUP };
-	gcd.ptszID = idt;
-
-	GCEVENT gce = {0};
-	gce.cbSize = sizeof(gce);
-	gce.dwFlags = GC_TCHAR;
-	gce.pDest = &gcd;
+	GCDEST gcd = { m_szModuleName, idt, GC_EVENT_ADDGROUP };
+	GCEVENT gce = { sizeof(gce), &gcd };
 	gce.ptszStatus = TranslateT("Me");
 	CallServiceSync(MS_GC_EVENT, 0, (LPARAM)&gce);
 
@@ -81,12 +72,9 @@ void CAimProto::chat_event(const char* id, const char* sn, int evt, const TCHAR*
 	TCHAR* nick = hContact ? (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, 
 		WPARAM(hContact), GCDNF_TCHAR) : snt;
 
-	GCDEST gcd = { m_szModuleName, { NULL },  evt };
-	gcd.ptszID = idt;
-
-	GCEVENT gce = {0};
-	gce.cbSize = sizeof(gce);
-	gce.dwFlags = GC_TCHAR | GCEF_ADDTOLOG;
+	GCDEST gcd = { m_szModuleName, idt, evt };
+	GCEVENT gce = { sizeof(gce), &gcd };
+	gce.dwFlags = GCEF_ADDTOLOG;
 	gce.pDest = &gcd;
 	gce.ptszNick = nick;
 	gce.ptszUID = snt;
@@ -104,12 +92,8 @@ void CAimProto::chat_leave(const char* id)
 {
 	TCHAR* idt = mir_a2t(id);
 
-	GCDEST gcd = { m_szModuleName, { NULL }, GC_EVENT_CONTROL };
-	gcd.ptszID = idt;
-
-	GCEVENT gce = {0};
-	gce.cbSize = sizeof(GCEVENT);
-	gce.dwFlags = GC_TCHAR;
+	GCDEST gcd = { m_szModuleName, idt, GC_EVENT_CONTROL };
+	GCEVENT gce = { sizeof(gce), &gcd };
 	gce.pDest = &gcd;
 	CallServiceSync(MS_GC_EVENT, SESSION_OFFLINE, (LPARAM)&gce);
 	CallServiceSync(MS_GC_EVENT, SESSION_TERMINATE, (LPARAM)&gce);
-- 
cgit v1.2.3