diff options
| author | George Hazan <ghazan@miranda.im> | 2018-04-27 11:18:52 +0200 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-04-27 11:18:52 +0200 |
| commit | d78c9d23d5ad5e1341e46094d7f9e29686acaa7e (patch) | |
| tree | a25e4f14cb92e3af8d2f9e0453757d856528b335 | |
| parent | 37071053f2bfb38733d0ef912b3a414f67b8be03 (diff) | |
code cleaning
| -rw-r--r-- | plugins/SimpleAR/src/Main.cpp | 2 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/sendlater.cpp | 3 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/sendqueue.cpp | 3 | ||||
| -rw-r--r-- | protocols/IRCG/src/commandmonitor.cpp | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/plugins/SimpleAR/src/Main.cpp b/plugins/SimpleAR/src/Main.cpp index 13bf7cd492..8375b1e5df 100644 --- a/plugins/SimpleAR/src/Main.cpp +++ b/plugins/SimpleAR/src/Main.cpp @@ -216,7 +216,7 @@ INT addEvent(WPARAM hContact, LPARAM hDBEvent) ProtoChainSend(hContact, PSS_MESSAGE, 0, pszUtf);
dbei.eventType = EVENTTYPE_MESSAGE;
- dbei.flags = DBEF_UTF | DBEF_SENT; //DBEF_READ;
+ dbei.flags = DBEF_UTF | DBEF_SENT;
dbei.szModule = pszProto;
dbei.timestamp = time(nullptr);
dbei.cbBlob = (int)mir_strlen(pszUtf) + 1;
diff --git a/plugins/TabSRMM/src/sendlater.cpp b/plugins/TabSRMM/src/sendlater.cpp index e98a46c087..bd7b744e35 100644 --- a/plugins/TabSRMM/src/sendlater.cpp +++ b/plugins/TabSRMM/src/sendlater.cpp @@ -438,11 +438,10 @@ HANDLE CSendLater::processAck(const ACKDATA *ack) if (!p->fSuccess) {
DBEVENTINFO dbei = {};
dbei.eventType = EVENTTYPE_MESSAGE;
- dbei.flags = DBEF_SENT;
+ dbei.flags = DBEF_SENT | DBEF_UTF;
dbei.szModule = GetContactProto((p->hContact));
dbei.timestamp = time(nullptr);
dbei.cbBlob = (int)mir_strlen(p->sendBuffer) + 1;
- dbei.flags |= DBEF_UTF;
dbei.pBlob = (PBYTE)(p->sendBuffer);
db_event_add(p->hContact, &dbei);
diff --git a/plugins/TabSRMM/src/sendqueue.cpp b/plugins/TabSRMM/src/sendqueue.cpp index 850ddee811..5b2fbd4979 100644 --- a/plugins/TabSRMM/src/sendqueue.cpp +++ b/plugins/TabSRMM/src/sendqueue.cpp @@ -460,7 +460,7 @@ int SendQueue::ackMessage(CTabBaseDlg *dat, WPARAM wParam, LPARAM lParam) DBEVENTINFO dbei = {}; dbei.eventType = EVENTTYPE_MESSAGE; - dbei.flags = DBEF_SENT; + dbei.flags = DBEF_SENT | DBEF_UTF; dbei.szModule = GetContactProto(job.hContact); dbei.timestamp = time(nullptr); dbei.cbBlob = (int)mir_strlen(job.szSendBuffer) + 1; @@ -474,7 +474,6 @@ int SendQueue::ackMessage(CTabBaseDlg *dat, WPARAM wParam, LPARAM lParam) if (job.dwFlags & PREF_RTL) dbei.flags |= DBEF_RTL; - dbei.flags |= DBEF_UTF; dbei.pBlob = (PBYTE)job.szSendBuffer; MessageWindowEvent evt = { job.iSendId, job.hContact, &dbei }; diff --git a/protocols/IRCG/src/commandmonitor.cpp b/protocols/IRCG/src/commandmonitor.cpp index a7868bd26b..52d369a5ba 100644 --- a/protocols/IRCG/src/commandmonitor.cpp +++ b/protocols/IRCG/src/commandmonitor.cpp @@ -227,7 +227,7 @@ int CIrcProto::AddOutgoingMessageToDB(MCONTACT hContact, const wchar_t *msg) dbei.szModule = m_szModuleName;
dbei.eventType = EVENTTYPE_MESSAGE;
dbei.timestamp = (DWORD)time(nullptr);
- dbei.flags = DBEF_SENT + DBEF_UTF;
+ dbei.flags = DBEF_SENT | DBEF_UTF;
dbei.pBlob = (PBYTE)mir_utf8encodeW(S);
dbei.cbBlob = (DWORD)mir_strlen((char*)dbei.pBlob) + 1;
db_event_add(hContact, &dbei);
|