diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-03-30 17:32:39 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-03-30 17:32:39 +0000 |
| commit | 109877a3c75cb290c55755dcfc88794d2453669d (patch) | |
| tree | 3ede8b9170b2fc3f6f35dc2cea6742d44b19d631 /protocols/MRA/src/Mra_proto.cpp | |
| parent | fee8d991bdf4a59b563d1b92165ea0ed2f7bacb8 (diff) | |
MS_DB_EVENT_* services remained, but their calls removed
git-svn-id: http://svn.miranda-ng.org/main/trunk@4255 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/MRA/src/Mra_proto.cpp')
| -rw-r--r-- | protocols/MRA/src/Mra_proto.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/protocols/MRA/src/Mra_proto.cpp b/protocols/MRA/src/Mra_proto.cpp index ea501f1dcd..162dd9686c 100644 --- a/protocols/MRA/src/Mra_proto.cpp +++ b/protocols/MRA/src/Mra_proto.cpp @@ -655,24 +655,21 @@ DWORD CMraProto::MraCommandDispatcher(mrim_packet_header_t *pmaHeader, DWORD *pd {
BOOL bAdded;
BYTE btBuff[BUFF_SIZE_BLOB];
- DBEVENTINFO dbei = {0};
GetLPS(lpbData, dwDataSize, &lpbDataCurrent, &lpsEMail);
hContact = MraHContactFromEmail(lpsEMail.lpszData, lpsEMail.dwSize, TRUE, TRUE, &bAdded);
if (bAdded) MraUpdateContactInfo(hContact);
if (IsEMailChatAgent(lpsEMail.lpszData, lpsEMail.dwSize) == FALSE) {
- dbei.cbSize = sizeof(dbei);
+ DBEVENTINFO dbei = { sizeof(dbei) };
dbei.szModule = m_szModuleName;
dbei.timestamp = (DWORD)_time32(NULL);
dbei.flags = 0;
dbei.eventType = EVENTTYPE_ADDED;
- //dbei.cbBlob = 0;
CreateBlobFromContact(hContact, NULL, 0, (LPBYTE)&btBuff, SIZEOF(btBuff), &dwStringSize);
dbei.cbBlob = dwStringSize;
dbei.pBlob = btBuff;
-
- CallService(MS_DB_EVENT_ADD, 0, (LPARAM)&dbei);
+ db_event_add(0, &dbei);
}
GetContactBasicInfoW(hContact, NULL, NULL, NULL, &dwTemp, NULL, NULL, 0, NULL, NULL, 0, NULL, NULL, 0, NULL);
@@ -2004,17 +2001,14 @@ DWORD CMraProto::MraRecvCommand_Message(DWORD dwTime, DWORD dwFlags, MRA_LPS *pl DBWriteContactSettingByte(hContact, "CList", "Hidden", 1);
if (bAutoGrantAuth) { // auto grant auth
- DBEVENTINFO dbei = {0};
-
- dbei.cbSize = sizeof(dbei);
+ DBEVENTINFO dbei = { sizeof(dbei) };
dbei.szModule = m_szModuleName;
dbei.timestamp = _time32(NULL);
dbei.flags = DBEF_READ;
dbei.eventType = EVENTTYPE_AUTHREQUEST;
dbei.pBlob = (PBYTE)btBuff;
-
CreateBlobFromContact(hContact, lpwszMessage, dwMessageSize, btBuff, SIZEOF(btBuff), (size_t*)&dbei.cbBlob);
- CallService(MS_DB_EVENT_ADD, 0, (LPARAM)&dbei);
+ db_event_add(0, &dbei);
MraAuthorize(plpsFrom->lpszData, plpsFrom->dwSize);
}
else {
|