- chats services replaces with functions;

- chat calls switched from CallServiceSync to direct calls everywhere

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

1 files changed, 10 insertions, 10 deletions

diff --git a/protocols/AimOscar/src/chat.cpp b/protocols/AimOscar/src/chat.cpp
index 40a59adea1..2fcd8ee38f 100644
--- a/protocols/AimOscar/src/chat.cpp
+++ b/protocols/AimOscar/src/chat.cpp
@@ -28,7 +28,7 @@ void CAimProto::chat_register(void)
 	gcr.pColors = (COLORREF*)crCols;

 	gcr.ptszDispName = m_tszUserName;

 	gcr.pszModule = m_szModuleName;

-	CallServiceSync(MS_GC_REGISTER, 0, (LPARAM)&gcr);

+	Chat_Register(&gcr);

 

 	HookProtoEvent(ME_GC_EVENT, &CAimProto::OnGCEvent);

 	HookProtoEvent(ME_GC_BUILDMENU, &CAimProto::OnGCMenuHook);

@@ -43,21 +43,21 @@ void CAimProto::chat_start(const char* id, unsigned short exchange)
 	gcw.pszModule = m_szModuleName;

 	gcw.ptszName = idt;

 	gcw.ptszID = idt;

-	CallServiceSync(MS_GC_NEWSESSION, 0, (LPARAM)&gcw);

+	Chat_NewSession(&gcw);

 

 	GCDEST gcd = { m_szModuleName, idt, GC_EVENT_ADDGROUP };

 	GCEVENT gce = { sizeof(gce), &gcd };

 	gce.ptszStatus = TranslateT("Me");

-	CallServiceSync(MS_GC_EVENT, 0, (LPARAM)&gce);

+	Chat_Event(0, &gce);

 

 	gcd.iType = GC_EVENT_ADDGROUP;

 	gce.ptszStatus = TranslateT("Others");

-	CallServiceSync(MS_GC_EVENT, 0, (LPARAM)&gce);

+	Chat_Event(0, &gce);

 

 	gcd.iType = GC_EVENT_CONTROL;

-	CallServiceSync(MS_GC_EVENT, SESSION_INITDONE, (LPARAM)&gce);

-	CallServiceSync(MS_GC_EVENT, SESSION_ONLINE, (LPARAM)&gce);

-	CallServiceSync(MS_GC_EVENT, WINDOW_VISIBLE, (LPARAM)&gce);

+	Chat_Event(SESSION_INITDONE, &gce);

+	Chat_Event(SESSION_ONLINE, &gce);

+	Chat_Event(WINDOW_VISIBLE, &gce);

 

 	setWord(find_chat_contact(id), "Exchange", exchange);

 

@@ -83,7 +83,7 @@ void CAimProto::chat_event(const char* id, const char* sn, int evt, const wchar_
 	gce.ptszStatus = gce.bIsMe ? TranslateT("Me") : TranslateT("Others");

 	gce.ptszText = msg;

 	gce.time = time(NULL);

-	CallServiceSync(MS_GC_EVENT, 0, (LPARAM)&gce);

+	Chat_Event(0, &gce);

 

 	mir_free(snt);

 	mir_free(idt);

@@ -96,8 +96,8 @@ void CAimProto::chat_leave(const char* id)
 	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);

+	Chat_Event(SESSION_OFFLINE, &gce);

+	Chat_Event(SESSION_TERMINATE, &gce);

 

 	mir_free(idt);

 }