diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-11-28 17:38:49 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-11-28 17:38:49 +0000 |
| commit | 5e9e63c45e37917ffb0acd83832d0d8f99d01883 (patch) | |
| tree | 1b674b85b1f582a13bd2a57ec73377b8989141bc /protocols/JabberG | |
| parent | 7105dcf75bdd939ca52ba045bc29c536c3f7ba49 (diff) | |
new macroses for MS_PROTO_CHAINRECV: ProtoChainRecv, ProtoChainRecvMsg & ProtoChainRecvFile
git-svn-id: http://svn.miranda-ng.org/main/trunk@2540 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG')
| -rw-r--r-- | protocols/JabberG/src/jabber_ft.cpp | 3 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_iq_handlers.cpp | 4 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_thread.cpp | 7 |
3 files changed, 3 insertions, 11 deletions
diff --git a/protocols/JabberG/src/jabber_ft.cpp b/protocols/JabberG/src/jabber_ft.cpp index eb4f9a58e7..240e6d4bef 100644 --- a/protocols/JabberG/src/jabber_ft.cpp +++ b/protocols/JabberG/src/jabber_ft.cpp @@ -371,8 +371,7 @@ void CJabberProto::FtHandleSiRequest(HXML iqNode) if ((n = xmlGetChild(fileNode , "desc")) != NULL)
pre.tszDescription = (TCHAR*)xmlGetText(n);
- CCSDATA ccs = { ft->std.hContact, PSR_FILE, 0, (LPARAM)&pre };
- CallService(MS_PROTO_CHAINRECV, 0, (LPARAM)&ccs);
+ ProtoChainRecvFile(ft->std.hContact, &pre);
return;
}
else {
diff --git a/protocols/JabberG/src/jabber_iq_handlers.cpp b/protocols/JabberG/src/jabber_iq_handlers.cpp index 760267d5ee..ecf0064d61 100644 --- a/protocols/JabberG/src/jabber_iq_handlers.cpp +++ b/protocols/JabberG/src/jabber_iq_handlers.cpp @@ -722,9 +722,7 @@ BOOL CJabberProto::OnIqRequestOOB(HXML, CJabberIqInfo *pInfo) pre.ptszFiles = &str2;
pre.fileCount = 1;
pre.lParam = (LPARAM)ft;
-
- CCSDATA ccs = { ft->std.hContact, PSR_FILE, 0, (LPARAM)&pre };
- CallService(MS_PROTO_CHAINRECV, 0, (LPARAM)&ccs);
+ ProtoChainRecvFile(ft->std.hContact, &pre);
mir_free(str2);
}
else {
diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp index 0604e9c3b1..b116a87ca6 100644 --- a/protocols/JabberG/src/jabber_thread.cpp +++ b/protocols/JabberG/src/jabber_thread.cpp @@ -1508,12 +1508,7 @@ void CJabberProto::OnProcessMessage(HXML node, ThreadData* info) recv.lParam = (LPARAM)AddToLastResourceMap(from);
LeaveCriticalSection(&m_csLastResourceMap);
- CCSDATA ccs;
- ccs.hContact = hContact;
- ccs.wParam = 0;
- ccs.szProtoService = PSR_MESSAGE;
- ccs.lParam = (LPARAM)&recv;
- CallService(MS_PROTO_CHAINRECV, 0, (LPARAM)&ccs);
+ ProtoChainRecvMsg(hContact, &recv);
mir_free((void*)szMessage);
mir_free(buf);
|