diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-09-16 11:50:15 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-09-16 11:50:15 +0000 |
| commit | 5161fd3fe53b85f579cfece81e25b562f1fa56ae (patch) | |
| tree | 3ac6979cd3774351cb68431da64ca014f1170e98 /protocols/MSN/msn_commands.cpp | |
| parent | ce6e5ab03d58151c4eda36d05a8436d337b2d3c0 (diff) | |
- event code standardization for protocols
- fix for EVENTTYPE_AUTHREQUEST processing
- protocols' custom CallService core removed
git-svn-id: http://svn.miranda-ng.org/main/trunk@1576 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/MSN/msn_commands.cpp')
| -rw-r--r-- | protocols/MSN/msn_commands.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/protocols/MSN/msn_commands.cpp b/protocols/MSN/msn_commands.cpp index 76dab93234..5a239dd986 100644 --- a/protocols/MSN/msn_commands.cpp +++ b/protocols/MSN/msn_commands.cpp @@ -161,7 +161,7 @@ void CMsnProto::sttInviteMessage(ThreadData* info, char* msgBody, char* email, c ccs.szProtoService = PSR_FILE;
ccs.wParam = 0;
ccs.lParam = (LPARAM)⪯
- MSN_CallService(MS_PROTO_CHAINRECV, 0, (LPARAM)&ccs);
+ CallService(MS_PROTO_CHAINRECV, 0, (LPARAM)&ccs);
return;
}
@@ -310,7 +310,7 @@ void CMsnProto::sttCustomSmiley(const char* msgBody, char* email, char* nick, in char* buf = (char*)mir_alloc(rlen);
NETLIBBASE64 nlb = { buf, (int)rlen, (PBYTE)lastsml, (int)slen };
- MSN_CallService(MS_NETLIB_BASE64ENCODE, 0, LPARAM(&nlb));
+ CallService(MS_NETLIB_BASE64ENCODE, 0, LPARAM(&nlb));
char* smileyName = (char*)mir_alloc(rlen*3);
UrlEncode(buf, smileyName, rlen*3);
@@ -509,7 +509,7 @@ void CMsnProto::MSN_ReceiveMessage(ThreadData* info, char* cmdString, char* para {
if (!sentMsg)
{
- MSN_CallService(MS_PROTO_CONTACTISTYPING, WPARAM(ccs.hContact), 0);
+ CallService(MS_PROTO_CONTACTISTYPING, WPARAM(ccs.hContact), 0);
PROTORECVEVENT pre;
pre.szMessage = (char*)msgBody;
@@ -520,7 +520,7 @@ void CMsnProto::MSN_ReceiveMessage(ThreadData* info, char* cmdString, char* para ccs.szProtoService = PSR_MESSAGE;
ccs.wParam = 0;
ccs.lParam = (LPARAM)⪯
- MSN_CallService(MS_PROTO_CHAINRECV, 0, (LPARAM)&ccs);
+ CallService(MS_PROTO_CHAINRECV, 0, (LPARAM)&ccs);
}
else
{
@@ -535,7 +535,7 @@ void CMsnProto::MSN_ReceiveMessage(ThreadData* info, char* cmdString, char* para dbei.timestamp = time(NULL);
dbei.cbBlob = (unsigned)strlen(msgBody) + 1;
dbei.pBlob = (PBYTE)msgBody;
- MSN_CallService(MS_DB_EVENT_ADD, (WPARAM)ccs.hContact, (LPARAM)&dbei);
+ CallService(MS_DB_EVENT_ADD, (WPARAM)ccs.hContact, (LPARAM)&dbei);
}
}
}
@@ -564,7 +564,7 @@ void CMsnProto::MSN_ReceiveMessage(ThreadData* info, char* cmdString, char* para if (tTypingUser != NULL && info->mChatID[0] == 0 && _stricmp(email, MyOptions.szEmail))
{
HANDLE hContact = MSN_HContactFromEmail(tTypingUser, tTypingUser);
- MSN_CallService(MS_PROTO_CONTACTISTYPING, (WPARAM) hContact, 7);
+ CallService(MS_PROTO_CONTACTISTYPING, (WPARAM) hContact, 7);
}
}
else if (!_strnicmp(tContentType, "text/x-msnmsgr-datacast", 23))
@@ -789,7 +789,7 @@ void CMsnProto::sttProcessRemove(char* buf, size_t len) {
if (msc->hContact && _stricmp(szEmail, MyOptions.szEmail))
{
- MSN_CallService(MS_DB_CONTACT_DELETE, (WPARAM)msc->hContact, 0);
+ CallService(MS_DB_CONTACT_DELETE, (WPARAM)msc->hContact, 0);
msc->hContact = NULL;
}
}
@@ -984,7 +984,7 @@ void CMsnProto::sttProcessPage(char* buf, unsigned len) ccs.hContact = MSN_HContactFromEmail(szTel, szTel, true, true);
ccs.szProtoService = PSR_MESSAGE;
ccs.lParam = (LPARAM)⪯
- MSN_CallService(MS_PROTO_CHAINRECV, 0, (LPARAM)&ccs);
+ CallService(MS_PROTO_CHAINRECV, 0, (LPARAM)&ccs);
}
ezxml_free(xmlnot);
|