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/MirOTR/MirOTR/dllmain.cpp | 4 ++-- plugins/MirOTR/MirOTR/options.cpp | 4 ++-- plugins/MirOTR/MirOTR/utils.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'plugins/MirOTR') diff --git a/plugins/MirOTR/MirOTR/dllmain.cpp b/plugins/MirOTR/MirOTR/dllmain.cpp index 59841d4e1d..80833c9b2e 100644 --- a/plugins/MirOTR/MirOTR/dllmain.cpp +++ b/plugins/MirOTR/MirOTR/dllmain.cpp @@ -110,10 +110,10 @@ DLLFUNC int Load(void) // remove us as a filter to all contacts - fix filter type problem if(DBGetContactSettingByte(0, MODULENAME, "FilterOrderFix", 0) != 2) { - HANDLE hContact = ( HANDLE )CallService( MS_DB_CONTACT_FINDFIRST, 0, 0 ); + HANDLE hContact = db_find_first(); while ( hContact != NULL ) { CallService( MS_PROTO_REMOVEFROMCONTACT, ( WPARAM )hContact, ( LPARAM )MODULENAME ); - hContact = ( HANDLE )CallService( MS_DB_CONTACT_FINDNEXT,( WPARAM )hContact, 0 ); + hContact = db_find_next(hContact); } DBWriteContactSettingByte(0, MODULENAME, "FilterOrderFix", 2); } diff --git a/plugins/MirOTR/MirOTR/options.cpp b/plugins/MirOTR/MirOTR/options.cpp index 91a3cd34df..8af221d5da 100644 --- a/plugins/MirOTR/MirOTR/options.cpp +++ b/plugins/MirOTR/MirOTR/options.cpp @@ -578,7 +578,7 @@ static INT_PTR CALLBACK DlgProcMirOTROptsContacts(HWND hwndDlg, UINT msg, WPARAM const char *proto; TCHAR *proto_t; - HANDLE hContact = ( HANDLE )CallService( MS_DB_CONTACT_FINDFIRST, 0, 0 ); + HANDLE hContact = db_find_first(); while ( hContact != NULL ) { proto = contact_get_proto(hContact); @@ -600,7 +600,7 @@ static INT_PTR CALLBACK DlgProcMirOTROptsContacts(HWND hwndDlg, UINT msg, WPARAM } - hContact = ( HANDLE )CallService( MS_DB_CONTACT_FINDNEXT,( WPARAM )hContact, 0 ); + hContact = db_find_next(hContact); } } return TRUE; diff --git a/plugins/MirOTR/MirOTR/utils.cpp b/plugins/MirOTR/MirOTR/utils.cpp index 2b592742d4..ce2bbc5b9a 100644 --- a/plugins/MirOTR/MirOTR/utils.cpp +++ b/plugins/MirOTR/MirOTR/utils.cpp @@ -19,7 +19,7 @@ void lib_cs_unlock() { } HANDLE find_contact(const char* userid, const char* protocol) { - HANDLE hContact = ( HANDLE )CallService( MS_DB_CONTACT_FINDFIRST, 0, 0 ); + HANDLE hContact = db_find_first(); while ( hContact != NULL ) { const char *proto = contact_get_proto(hContact); @@ -31,7 +31,7 @@ HANDLE find_contact(const char* userid, const char* protocol) { } mir_free(name); } - hContact = ( HANDLE )CallService( MS_DB_CONTACT_FINDNEXT,( WPARAM )hContact, 0 ); + hContact = db_find_next(hContact); } return 0; -- cgit v1.2.3