From 109877a3c75cb290c55755dcfc88794d2453669d Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sat, 30 Mar 2013 17:32:39 +0000
Subject: 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
---
 plugins/NewEventNotify/src/main.cpp  |  5 ++---
 plugins/NewEventNotify/src/popup.cpp | 22 ++++++++++------------
 2 files changed, 12 insertions(+), 15 deletions(-)

(limited to 'plugins/NewEventNotify/src')

diff --git a/plugins/NewEventNotify/src/main.cpp b/plugins/NewEventNotify/src/main.cpp
index 67f3efd4ab..8d7c95c0e3 100644
--- a/plugins/NewEventNotify/src/main.cpp
+++ b/plugins/NewEventNotify/src/main.cpp
@@ -63,7 +63,6 @@ int HookedNewEvent(WPARAM wParam, LPARAM lParam)
 //lParam: dbevent-handle
 {
 	HANDLE hContact = (HANDLE)wParam;
-	DBEVENTINFO dbe = {0};
 	PLUGIN_DATA* pdata;
 	DBEVENTTYPEDESCR* pei;
 
@@ -72,8 +71,8 @@ int HookedNewEvent(WPARAM wParam, LPARAM lParam)
 		return 0;
 
 	//get DBEVENTINFO without pBlob
-	dbe.cbSize = sizeof(dbe);
-	CallService(MS_DB_EVENT_GET, (WPARAM)lParam, (LPARAM)&dbe);
+	DBEVENTINFO dbe = { sizeof(dbe) };
+	db_event_get((HANDLE)lParam, &dbe);
 
 	//do not show popups for sub-contacts
 	if (hContact && ServiceExists(MS_MC_GETMETACONTACT) && CallService(MS_MC_GETMETACONTACT, (WPARAM)hContact, 0))
diff --git a/plugins/NewEventNotify/src/popup.cpp b/plugins/NewEventNotify/src/popup.cpp
index 2da7db7fdd..3dd32db00d 100644
--- a/plugins/NewEventNotify/src/popup.cpp
+++ b/plugins/NewEventNotify/src/popup.cpp
@@ -109,7 +109,7 @@ int PopupAct(HWND hWnd, UINT mask, PLUGIN_DATA* pdata)
 			pdata->iLock = 1;
 			while (eventData) {
 				CallService(MS_CLIST_REMOVEEVENT, (WPARAM)pdata->hContact, (LPARAM)eventData->hEvent);
-				CallService(MS_DB_EVENT_MARKREAD, (WPARAM)pdata->hContact, (LPARAM)eventData->hEvent);			
+				db_event_markRead(pdata->hContact, eventData->hEvent);			
 				eventData = eventData->next;
 			}		
 			FreePopupEventData(pdata);
@@ -438,17 +438,15 @@ int PopupShow(PLUGIN_OPTIONS* pluginOptions, HANDLE hContact, HANDLE hEvent, UIN
 	}
 
 	//get DBEVENTINFO with pBlob if preview is needed (when is test then is off)
-	DBEVENTINFO dbe = {0};
-	dbe.cbSize = sizeof(dbe);
-
-	if ((pluginOptions->bPreview || eventType == EVENTTYPE_ADDED || eventType == EVENTTYPE_AUTHREQUEST) && hEvent) {
-		dbe.cbBlob = CallService(MS_DB_EVENT_GETBLOBSIZE, (WPARAM)hEvent, 0);
-		dbe.pBlob = (PBYTE)mir_alloc(dbe.cbBlob);
+	DBEVENTINFO dbe = { sizeof(dbe) };
+	if (hEvent) {
+		if ((pluginOptions->bPreview || eventType == EVENTTYPE_ADDED || eventType == EVENTTYPE_AUTHREQUEST)) {
+			dbe.cbBlob = db_event_getBlobSize(hEvent);
+			dbe.pBlob = (PBYTE)mir_alloc(dbe.cbBlob);
+		}
+		db_event_get(hEvent, &dbe);
 	}
 
-	if (hEvent)
-		CallService(MS_DB_EVENT_GET, (WPARAM)hEvent, (LPARAM)&dbe);
-
 	eventData = (EVENT_DATA_EX*)mir_alloc(sizeof(EVENT_DATA_EX));
 	eventData->hEvent = hEvent;
 	eventData->number = 1;
@@ -560,12 +558,12 @@ int PopupUpdate(HANDLE hContact, HANDLE hEvent)
 		dbe.pBlob = NULL;
 		dbe.cbBlob = 0;
 		if (pdata->pluginOptions->bPreview && eventData->hEvent) {
-			dbe.cbBlob = CallService(MS_DB_EVENT_GETBLOBSIZE, (WPARAM)eventData->hEvent, 0);
+			dbe.cbBlob = db_event_getBlobSize(eventData->hEvent);
 			dbe.pBlob = (PBYTE)mir_alloc(dbe.cbBlob);
 		}
 
 		if (eventData->hEvent)
-			CallService(MS_DB_EVENT_GET, (WPARAM)eventData->hEvent, (LPARAM)&dbe);
+			db_event_get(eventData->hEvent, &dbe);
 
 		if (pdata->pluginOptions->bShowDate || pdata->pluginOptions->bShowTime) {
 			TCHAR timestamp[MAX_DATASIZE];
-- 
cgit v1.2.3