1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/HistoryPlusPlus/hpp_searchthread.pas b/plugins/HistoryPlusPlus/hpp_searchthread.pas
index 30effa8ae4..d3bd22d361 100644
--- a/plugins/HistoryPlusPlus/hpp_searchthread.pas
+++ b/plugins/HistoryPlusPlus/hpp_searchthread.pas
@@ -251,7 +251,7 @@ procedure TSearchThread.BuildContactsList;
 var
   hCont: THandle;
 begin
-  hCont := CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);
+  hCont := db_find_first();
 
   while hCont <> 0 do
   begin
@@ -261,7 +261,7 @@ begin
     if SearchProtectedContacts or (not SearchProtectedContacts and (not IsUserProtected(hCont)))
     then
       AddContact(hCont);
-    hCont := CallService(MS_DB_CONTACT_FINDNEXT, hCont, 0);
+    hCont := db_find_next(hCont);
   end;
 
   AddContact(hCont);
@@ -274,7 +274,7 @@ var
   hCont: THandle;
 begin
   MaxProgress := 0;
-  hCont := CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);
+  hCont := db_find_first();
   while hCont <> 0 do
   begin
     // I hope I haven't messed this up by
@@ -282,7 +282,7 @@ begin
     if SearchProtectedContacts or (not SearchProtectedContacts and (not IsUserProtected(hCont)))
     then
       MaxProgress := MaxProgress + GetItemsCount(hCont);
-    hCont := CallService(MS_DB_CONTACT_FINDNEXT, hCont, 0);
+    hCont := db_find_next(hCont);
   end;
   // add sysem history
   MaxProgress := MaxProgress + GetItemsCount(hCont);
@@ -338,7 +338,7 @@ begin
     end;
 
 {$IFNDEF SMARTSEARCH}
-    hCont := CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);
+    hCont := db_find_first();
     while (hCont <> 0) and not Terminated do
     begin
       Inc(AllContacts);
@@ -352,7 +352,7 @@ begin
         else
           SearchContact(hCont);
       end;
-      hCont := CallService(MS_DB_CONTACT_FINDNEXT, hCont, 0);
+      hCont := db_find_next(hCont);
     end;
     if BookmarksMode then
       SearchBookmarks(hCont)