From f90be5cdeec5875d1022e1ef35f5b101bd76ac84 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 10 Oct 2012 07:46:53 +0000 Subject: service call replaced with the direct function call git-svn-id: http://svn.miranda-ng.org/main/trunk@1857 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/BuddyExpectator/src/BuddyExpectator.cpp | 8 ++++---- plugins/BuddyExpectator/src/options.cpp | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'plugins/BuddyExpectator/src') diff --git a/plugins/BuddyExpectator/src/BuddyExpectator.cpp b/plugins/BuddyExpectator/src/BuddyExpectator.cpp index 5f9e37e266..8a5093564f 100644 --- a/plugins/BuddyExpectator/src/BuddyExpectator.cpp +++ b/plugins/BuddyExpectator/src/BuddyExpectator.cpp @@ -672,7 +672,7 @@ int SettingChanged(WPARAM wParam, LPARAM lParam) void CALLBACK TimerProc(HWND, UINT, UINT_PTR, DWORD) { - HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0); + HANDLE hContact = db_find_first(); char *proto; while (hContact != 0) { @@ -704,7 +704,7 @@ void CALLBACK TimerProc(HWND, UINT, UINT_PTR, DWORD) GoneNotify(hContact, message); } - hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, 0); + hContact = db_find_next(hContact); } } /** @@ -873,7 +873,7 @@ extern "C" int __declspec(dllexport) Load(void) // ensure all contacts are timestamped DBVARIANT dbv; - HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0); + HANDLE hContact = db_find_first(); DWORD current_time = (DWORD)time(0); while (hContact != 0) { if ( !DBGetContactSetting(hContact, MODULE_NAME, "CreationTime", &dbv)) @@ -881,7 +881,7 @@ extern "C" int __declspec(dllexport) Load(void) else DBWriteContactSettingDword(hContact, MODULE_NAME, "CreationTime", current_time); - hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, 0); + hContact = db_find_next(hContact); } return 0; diff --git a/plugins/BuddyExpectator/src/options.cpp b/plugins/BuddyExpectator/src/options.cpp index e8f9de8e8c..f0a8e8cf7e 100644 --- a/plugins/BuddyExpectator/src/options.cpp +++ b/plugins/BuddyExpectator/src/options.cpp @@ -267,13 +267,13 @@ static INT_PTR CALLBACK OptionsFrameProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, SaveOptions(); // clear all notified settings - HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0); + HANDLE hContact = db_find_first(); while (hContact != 0) { if(DBGetContactSettingByte(hContact, MODULE_NAME, "StillAbsentNotified", 0)) DBWriteContactSettingByte(hContact, MODULE_NAME, "StillAbsentNotified", 0); - hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, 0); + hContact = db_find_next(hContact); } // restart timer & run check -- cgit v1.2.3