From 8d371aa2b1fa5a7bfe835dee9b60d1407b33047b Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 12 Mar 2014 13:40:35 +0000 Subject: 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 --- plugins/Import/src/import.cpp | 2 +- plugins/Import/src/utils.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'plugins/Import') diff --git a/plugins/Import/src/import.cpp b/plugins/Import/src/import.cpp index 3c9e413a22..cc005be35d 100644 --- a/plugins/Import/src/import.cpp +++ b/plugins/Import/src/import.cpp @@ -431,7 +431,7 @@ static void ImportHistory(MCONTACT hContact, PROTOACCOUNT **protocol, int protoC break; // Get next event - hEvent = srcDb->FindNextEvent(hEvent); + hEvent = srcDb->FindNextEvent(hContact, hEvent); i++; } mir_free(eventBuf); diff --git a/plugins/Import/src/utils.cpp b/plugins/Import/src/utils.cpp index b6946665ab..79e92bb9cf 100644 --- a/plugins/Import/src/utils.cpp +++ b/plugins/Import/src/utils.cpp @@ -139,7 +139,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); @@ -153,7 +153,7 @@ BOOL IsDuplicateEvent(MCONTACT hContact, DBEVENTINFO dbei) } hPreviousDbEvent = hExistingDbEvent; - hExistingDbEvent = db_event_next(hExistingDbEvent); + hExistingDbEvent = db_event_next(hContact, hExistingDbEvent); } } @@ -186,7 +186,7 @@ BOOL IsDuplicateEvent(MCONTACT hContact, DBEVENTINFO dbei) } // Get previous event in chain - hExistingDbEvent = db_event_prev(hExistingDbEvent); + hExistingDbEvent = db_event_prev(hContact, hExistingDbEvent); } } else { @@ -216,7 +216,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 -- cgit v1.2.3