diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-03-12 13:40:35 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-03-12 13:40:35 +0000 |
| commit | 8d371aa2b1fa5a7bfe835dee9b60d1407b33047b (patch) | |
| tree | 66de3db76891d5676ce504d84b844e7912caa144 /protocols/JabberG/src | |
| parent | 19862a932141daf02cb0ab5cae0f1222315ff49d (diff) | |
db_event_next/db_event_prev: first parameter hContact added
git-svn-id: http://svn.miranda-ng.org/main/trunk@8576 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/src')
| -rw-r--r-- | protocols/JabberG/src/jabber_archive.cpp | 8 | ||||
| -rw-r--r-- | protocols/JabberG/src/jabber_rc.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/protocols/JabberG/src/jabber_archive.cpp b/protocols/JabberG/src/jabber_archive.cpp index ae4e61ad05..91752216a0 100644 --- a/protocols/JabberG/src/jabber_archive.cpp +++ b/protocols/JabberG/src/jabber_archive.cpp @@ -159,7 +159,7 @@ BOOL IsDuplicateEvent(MCONTACT hContact, DBEVENTINFO& dbei) return TRUE;
// find event with another timestamp
- hExistingDbEvent = db_event_next(hPreviousDbEvent);
+ hExistingDbEvent = db_event_next(hContact, hPreviousDbEvent);
while (hExistingDbEvent != NULL) {
ZeroMemory(&dbeiExisting, sizeof(dbeiExisting));
dbeiExisting.cbSize = sizeof(dbeiExisting);
@@ -173,7 +173,7 @@ BOOL IsDuplicateEvent(MCONTACT hContact, DBEVENTINFO& dbei) }
hPreviousDbEvent = hExistingDbEvent;
- hExistingDbEvent = db_event_next(hExistingDbEvent);
+ hExistingDbEvent = db_event_next(hContact, hExistingDbEvent);
}
}
@@ -206,7 +206,7 @@ BOOL IsDuplicateEvent(MCONTACT hContact, DBEVENTINFO& dbei) }
// Get previous event in chain
- hExistingDbEvent = db_event_prev(hExistingDbEvent);
+ hExistingDbEvent = db_event_prev(hContact, hExistingDbEvent);
}
}
else {
@@ -236,7 +236,7 @@ BOOL IsDuplicateEvent(MCONTACT hContact, DBEVENTINFO& dbei) }
// Get next event in chain
- hExistingDbEvent = db_event_next(hExistingDbEvent);
+ hExistingDbEvent = db_event_next(hContact, hExistingDbEvent);
}
}
// reset last event
diff --git a/protocols/JabberG/src/jabber_rc.cpp b/protocols/JabberG/src/jabber_rc.cpp index 43be114329..cc6dedf04f 100644 --- a/protocols/JabberG/src/jabber_rc.cpp +++ b/protocols/JabberG/src/jabber_rc.cpp @@ -469,7 +469,7 @@ int CJabberProto::RcGetUnreadEventsCount() ptrT jid( getTStringA(hContact, "jid"));
if (jid == NULL) continue;
- for (HANDLE hDbEvent = db_event_firstUnread(hContact); hDbEvent; hDbEvent = db_event_next(hDbEvent)) {
+ for (HANDLE hDbEvent = db_event_firstUnread(hContact); hDbEvent; hDbEvent = db_event_next(hContact, hDbEvent)) {
DBEVENTINFO dbei = { sizeof(dbei) };
dbei.cbBlob = db_event_getBlobSize(hDbEvent);
if (dbei.cbBlob == -1)
@@ -556,7 +556,7 @@ int CJabberProto::AdhocForwardHandler(HXML, CJabberIqInfo *pInfo, CJabberAdhocSe if (tszJid == NULL)
continue;
- for (HANDLE hDbEvent = db_event_firstUnread(hContact); hDbEvent; hDbEvent = db_event_next(hDbEvent)) {
+ for (HANDLE hDbEvent = db_event_firstUnread(hContact); hDbEvent; hDbEvent = db_event_next(hContact, hDbEvent)) {
DBEVENTINFO dbei = { sizeof(dbei) };
dbei.cbBlob = db_event_getBlobSize(hDbEvent);
if (dbei.cbBlob == -1)
|