second major wipeout of database services & structures:

- DBCONTACTENUMSETTINGS removed;
- all helpers moved to mir_core.dll

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

1 files changed, 5 insertions, 5 deletions

diff --git a/protocols/FacebookRM/src/contacts.cpp b/protocols/FacebookRM/src/contacts.cpp
index 36d2536f92..f0b8852938 100644
--- a/protocols/FacebookRM/src/contacts.cpp
+++ b/protocols/FacebookRM/src/contacts.cpp
@@ -97,7 +97,7 @@ MCONTACT FacebookProto::ChatIDToHContact(const std::string &chat_id)
 	auto it = facy.chat_id_to_hcontact.find(chat_id);
 	if (it != facy.chat_id_to_hcontact.end()) {
 		// Check if contact is still valid
-		if (CallService(MS_DB_CONTACT_IS, (WPARAM)it->second) == 1)
+		if (db_is_contact((WPARAM)it->second) == 1)
 			return it->second;
 		else
 			facy.chat_id_to_hcontact.erase(it);
@@ -129,7 +129,7 @@ MCONTACT FacebookProto::ContactIDToHContact(const std::string &user_id)
 	std::map<std::string, MCONTACT>::iterator it = facy.user_id_to_hcontact.find(user_id);
 	if (it != facy.user_id_to_hcontact.end()) {
 		// Check if contact is still valid
-		if (CallService(MS_DB_CONTACT_IS, (WPARAM)it->second) == 1)
+		if (db_is_contact((WPARAM)it->second) == 1)
 			return it->second;
 		else
 			facy.user_id_to_hcontact.erase(it);
@@ -401,10 +401,10 @@ MCONTACT FacebookProto::AddToContactList(facebook_user* fbu, bool force_add, boo
 	}
 
 	// Try to make a new contact
-	MCONTACT hContact = (MCONTACT)CallService(MS_DB_CONTACT_ADD);
+	MCONTACT hContact = db_add_contact();
 
 	if (hContact && Proto_AddToContact(hContact, m_szModuleName) != 0) {
-		CallService(MS_DB_CONTACT_DELETE, hContact);
+		db_delete_contact(hContact);
 		hContact = NULL;
 	}
 
@@ -625,7 +625,7 @@ void FacebookProto::IgnoreFriendshipRequest(void *data)
 
 		// Delete this contact, if he's temporary
 		if (db_get_b(hContact, "CList", "NotOnList", 0))
-			CallService(MS_DB_CONTACT_DELETE, hContact);
+			db_delete_contact(hContact);
 	}
 	else facy.client_notify(TranslateT("Error occurred when ignoring friendship request."));