1 files changed, 8 insertions, 14 deletions
diff --git a/plugins/BuddyExpectator/src/BuddyExpectator.cpp b/plugins/BuddyExpectator/src/BuddyExpectator.cpp
index d6e425ea36..bdaff06159 100644
--- a/plugins/BuddyExpectator/src/BuddyExpectator.cpp
+++ b/plugins/BuddyExpectator/src/BuddyExpectator.cpp
@@ -81,20 +81,14 @@ void setLastSeen(HANDLE hContact)
 
 time_t getLastInputMsg(HANDLE hContact)
 {
-	HANDLE hDbEvent;
-	DBEVENTINFO dbei = {0};
-
-	hDbEvent = (HANDLE)CallService(MS_DB_EVENT_FINDLAST, (WPARAM)hContact, 0);
-    while (hDbEvent)
-	{
-        dbei.cbSize = sizeof(dbei);
-        dbei.pBlob = 0;
-        dbei.cbBlob = 0;
-        CallService(MS_DB_EVENT_GET, (WPARAM)hDbEvent, (LPARAM)&dbei);
-        if (dbei.eventType == EVENTTYPE_MESSAGE && !(dbei.flags & DBEF_SENT))
-            return dbei.timestamp;
-        hDbEvent = (HANDLE)CallService(MS_DB_EVENT_FINDPREV, (WPARAM)hDbEvent, 0);
-    }
+	HANDLE hDbEvent = db_event_last(hContact);
+	while (hDbEvent) {
+		DBEVENTINFO dbei = { sizeof(dbei) };
+		db_event_get(hDbEvent, &dbei);
+		if (dbei.eventType == EVENTTYPE_MESSAGE && !(dbei.flags & DBEF_SENT))
+			return dbei.timestamp;
+		hDbEvent = db_event_prev(hDbEvent);
+	}
 	return -1;
 }