service call replaced with the direct function call

git-svn-id: http://svn.miranda-ng.org/main/trunk@1857 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

3 files changed, 14 insertions, 14 deletions

diff --git a/plugins/SecureIM/src/crypt_icons.cpp b/plugins/SecureIM/src/crypt_icons.cpp
index 6c5984c345..34263addc8 100644
--- a/plugins/SecureIM/src/crypt_icons.cpp
+++ b/plugins/SecureIM/src/crypt_icons.cpp
@@ -128,21 +128,21 @@ void RefreshContactListIcons(void) {
 	HANDLE hContact;

 //	CallService(MS_CLUI_LISTBEGINREBUILD,0,0);

 	if ( !g_hCLIcon ) {

-	    hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);

+	    hContact = db_find_first();

 	    while (hContact) { // сначала все выключаем

 		ShowStatusIcon(hContact,-1);

-		hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, 0);

+		hContact = db_find_next(hContact);

 	    }

 	    // менем местоположение иконки

 	    for(int i=0;i<1+MODE_CNT*IEC_CNT;i++) {

 		g_IEC[i].ColumnType = bADV;

 	    }

 	}

-	hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);

+	hContact = db_find_first();

 	while (hContact) { // и снова зажигаем иконку

 		if ( isSecureProtocol(hContact))

 			ShowStatusIcon(hContact);

-		hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, 0);

+		hContact = db_find_next(hContact);

 	}

 //	CallService(MS_CLUI_LISTENDREBUILD,0,0);

 }

diff --git a/plugins/SecureIM/src/crypt_lists.cpp b/plugins/SecureIM/src/crypt_lists.cpp
index 7b1225d2a2..177d5756e6 100644
--- a/plugins/SecureIM/src/crypt_lists.cpp
+++ b/plugins/SecureIM/src/crypt_lists.cpp
@@ -135,10 +135,10 @@ void loadContactList() {
 	freeContactList();

 	loadSupportedProtocols();

 

-	HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);

+	HANDLE hContact = db_find_first();

 	while (hContact) {

 		addContact(hContact);

-		hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, 0);

+		hContact = db_find_next(hContact);

 	}

 }

 

diff --git a/plugins/SecureIM/src/options.cpp b/plugins/SecureIM/src/options.cpp
index 171fcc28cb..6e698a7dae 100644
--- a/plugins/SecureIM/src/options.cpp
+++ b/plugins/SecureIM/src/options.cpp
@@ -1148,7 +1148,7 @@ void RefreshGeneralDlg(HWND hDlg, BOOL iInit) {
 	LVITEM lvi; memset(&lvi,0,sizeof(lvi));

 	lvi.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM;

 

-	HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);

+	HANDLE hContact = db_find_first();

 	char tmp[NAMSIZE];

 

 	while (hContact) {

@@ -1178,7 +1178,7 @@ void RefreshGeneralDlg(HWND hDlg, BOOL iInit) {
 			else				setListViewPUB(hLV, itemNum, hasKey(ptr));

 			setListViewIcon(hLV, itemNum, ptr);

 		}

-		hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, 0);

+		hContact = db_find_next(hContact);

 	}

 	ListView_Sort(hLV,(LPARAM)0);

 }

@@ -1252,7 +1252,7 @@ void RefreshPGPDlg(HWND hDlg, BOOL iInit) {
 	LVITEM lvi; memset(&lvi,0,sizeof(lvi));

 	lvi.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM;

 

-	HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);

+	HANDLE hContact = db_find_first();

 	char tmp[NAMSIZE];

 

 	while (hContact) {

@@ -1276,7 +1276,7 @@ void RefreshPGPDlg(HWND hDlg, BOOL iInit) {
 			LV_SetItemTextA(hLV, itemNum, 2, (szKeyID)?szKeyID:Translate(sim221));

 			SAFE_FREE(szKeyID);

 		}

-		hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, 0);

+		hContact = db_find_next(hContact);

 	}

 	ListView_Sort(hLV,(LPARAM)0x10);

 }

@@ -1322,7 +1322,7 @@ void RefreshGPGDlg(HWND hDlg, BOOL iInit) {
 	LVITEM lvi; memset(&lvi,0,sizeof(lvi));

 	lvi.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM;

 

-	HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);

+	HANDLE hContact = db_find_first();

 	char tmp[NAMSIZE];

 

 	while (hContact) {

@@ -1351,7 +1351,7 @@ void RefreshGPGDlg(HWND hDlg, BOOL iInit) {
 			LV_SetItemTextA(hLV, itemNum, 3, (ptr->tgpgMode)?Translate(sim228):Translate(sim229));

 			SAFE_FREE(szKeyID);

 		}

-		hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, 0);

+		hContact = db_find_next(hContact);

 	}

 	ListView_Sort(hLV,(LPARAM)0x20);

 }

@@ -1387,7 +1387,7 @@ void ResetGeneralDlg(HWND hDlg) {
 	LVITEM lvi; memset(&lvi,0,sizeof(lvi));

 	lvi.mask = LVIF_TEXT | LVIF_IMAGE | LVIF_PARAM;

 

-	HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);

+	HANDLE hContact = db_find_first();

 	char tmp[NAMSIZE];

 

 	while (hContact) {

@@ -1417,7 +1417,7 @@ void ResetGeneralDlg(HWND hDlg) {
 			else				setListViewPUB(hLV, itemNum, 0);

 			setListViewIcon(hLV, itemNum, ptr);

 		}

-		hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, 0);

+		hContact = db_find_next(hContact);

 	}

 }