From 8d371aa2b1fa5a7bfe835dee9b60d1407b33047b Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
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/TabSRMM/src/generic_msghandlers.cpp | 4 ++--
 plugins/TabSRMM/src/globals.cpp             | 2 +-
 plugins/TabSRMM/src/msgdialog.cpp           | 2 +-
 plugins/TabSRMM/src/msgdlgutils.cpp         | 4 ++--
 plugins/TabSRMM/src/msglog.cpp              | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'plugins/TabSRMM/src')

diff --git a/plugins/TabSRMM/src/generic_msghandlers.cpp b/plugins/TabSRMM/src/generic_msghandlers.cpp
index 3c5fa197b0..b0a2f456c0 100644
--- a/plugins/TabSRMM/src/generic_msghandlers.cpp
+++ b/plugins/TabSRMM/src/generic_msghandlers.cpp
@@ -1628,7 +1628,7 @@ void TSAPI DM_EventAdded(TWindowData *dat, WPARAM wParam, LPARAM lParam)
 	if (dbei.eventType == EVENTTYPE_MESSAGE && (dbei.flags & DBEF_READ))
 		return;
 
-	if ( !DbEventIsShown(dat, &dbei))
+	if (!DbEventIsShown(dat, &dbei))
 		return;
 
 	if (dbei.eventType == EVENTTYPE_MESSAGE && !(dbei.flags & (DBEF_SENT))) {
@@ -1667,7 +1667,7 @@ void TSAPI DM_EventAdded(TWindowData *dat, WPARAM wParam, LPARAM lParam)
 	dat->cache->updateStats(TSessionStats::UPDATE_WITH_LAST_RCV, 0);
 
 	if (hDbEvent != dat->hDbEventFirst) {
-		HANDLE nextEvent = db_event_next(hDbEvent);
+		HANDLE nextEvent = db_event_next(dat->hContact, hDbEvent);
 		if (1 || nextEvent == 0) {
 			if (!(dat->dwFlagsEx & MWF_SHOW_SCROLLINGDISABLED))
 				SendMessage(hwndDlg, DM_APPENDTOLOG, lParam, 0);
diff --git a/plugins/TabSRMM/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp
index 891042ecde..2b67db3486 100644
--- a/plugins/TabSRMM/src/globals.cpp
+++ b/plugins/TabSRMM/src/globals.cpp
@@ -592,7 +592,7 @@ void CGlobals::RestoreUnreadMessageAlerts(void)
 				cle.ptszTooltip = toolTip;
 				CallService(MS_CLIST_ADDEVENT, 0, (LPARAM)&cle);
 			}
-			hDbEvent = db_event_next(hDbEvent);
+			hDbEvent = db_event_next(hContact, hDbEvent);
 		}
 	}
 }
diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp
index b2a5898ec1..9598cab24f 100644
--- a/plugins/TabSRMM/src/msgdialog.cpp
+++ b/plugins/TabSRMM/src/msgdialog.cpp
@@ -1465,7 +1465,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 					EnableSendButton(dat, TRUE);
 			}
 			
-			for (HANDLE hdbEvent = db_event_last(dat->hContact); hdbEvent; hdbEvent = db_event_prev(hdbEvent)) {
+			for (HANDLE hdbEvent = db_event_last(dat->hContact); hdbEvent; hdbEvent = db_event_prev(dat->hContact, hdbEvent)) {
 				DBEVENTINFO dbei = { sizeof(dbei) };
 				db_event_get(hdbEvent, &dbei);
 				if (dbei.eventType == EVENTTYPE_MESSAGE && !(dbei.flags & DBEF_SENT)) {
diff --git a/plugins/TabSRMM/src/msgdlgutils.cpp b/plugins/TabSRMM/src/msgdlgutils.cpp
index ee8378c24c..df5d69b4c5 100644
--- a/plugins/TabSRMM/src/msgdlgutils.cpp
+++ b/plugins/TabSRMM/src/msgdlgutils.cpp
@@ -1385,7 +1385,7 @@ void TSAPI FindFirstEvent(TWindowData *dat)
 				if (dat->hDbEventFirst == NULL)
 					hPrevEvent = db_event_last(dat->hContact);
 				else
-					hPrevEvent = db_event_prev(dat->hDbEventFirst);
+					hPrevEvent = db_event_prev(dat->hContact, dat->hDbEventFirst);
 				if (hPrevEvent == NULL)
 					break;
 				dbei.cbBlob = 0;
@@ -1411,7 +1411,7 @@ void TSAPI FindFirstEvent(TWindowData *dat)
 			if (dat->hDbEventFirst == NULL)
 				hPrevEvent = db_event_last(dat->hContact);
 			else
-				hPrevEvent = db_event_prev(dat->hDbEventFirst);
+				hPrevEvent = db_event_prev(dat->hContact, dat->hDbEventFirst);
 			if (hPrevEvent == NULL)
 				break;
 			dbei.cbBlob = 0;
diff --git a/plugins/TabSRMM/src/msglog.cpp b/plugins/TabSRMM/src/msglog.cpp
index a0960614c7..00ba701c84 100644
--- a/plugins/TabSRMM/src/msglog.cpp
+++ b/plugins/TabSRMM/src/msglog.cpp
@@ -1167,7 +1167,7 @@ static DWORD CALLBACK LogStreamInEvents(DWORD_PTR dwCookie, LPBYTE pbBuff, LONG
 					dat->buffer = Template_CreateRTFFromDbEvent(dat->dlgDat, dat->hContact, dat->hDbEvent, !dat->isEmpty, dat);
 					if (dat->buffer)
 						dat->hDbEventLast = dat->hDbEvent;
-					dat->hDbEvent = db_event_next(dat->hDbEvent);
+					dat->hDbEvent = db_event_next(dat->hContact, dat->hDbEvent);
 					if (--dat->eventsToInsert == 0)
 						break;
 				}
-- 
cgit v1.2.3