From 38853f0f252956930d6bd5bcd864fb76670d548b Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 1 Feb 2019 19:38:46 +0300 Subject: four forgotten meta services removed --- plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'plugins/UserInfoEx') diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp index 5c90624aaa..b349ab7b71 100644 --- a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp +++ b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp @@ -630,7 +630,7 @@ int CExImContactXML::ImportNormalContact() // remove contact from a metacontact if (err == ERROR_OK && db_mc_getMeta(_hContact)) - CallService(MS_MC_REMOVEFROMMETA, NULL, (LPARAM)_hContact); + db_mc_removeFromMeta(_hContact); return err; } @@ -667,7 +667,7 @@ int CExImContactXML::Import(BYTE keepMetaSubContact) return result; // convert default subcontact to metacontact - _hContact = (MCONTACT)CallService(MS_MC_CONVERTTOMETA, (WPARAM)vContact.handle(), NULL); + _hContact = db_mc_convertToMeta(vContact.handle()); if (_hContact == NULL) { _hContact = INVALID_CONTACT_ID; return ERROR_CONVERT_METACONTACT; @@ -705,7 +705,7 @@ int CExImContactXML::Import(BYTE keepMetaSubContact) // load contact information int result = ImportContact(); if (result == ERROR_OK && !keepMetaSubContact) - CallService(MS_MC_REMOVEFROMMETA, NULL, (LPARAM)_hContact); + db_mc_removeFromMeta(_hContact); return result; } @@ -730,7 +730,7 @@ int CExImContactXML::ImportMetaSubContact(CExImContactXML * pMetaContact) // check if contact is subcontact of the desired meta contact if (db_mc_getMeta(_hContact) != pMetaContact->handle()) { // add contact to the metacontact (this service returns TRUE if successful) - err = CallService(MS_MC_ADDTOMETA, _hContact, (LPARAM)pMetaContact->handle()); + err = db_mc_addToMeta(_hContact, pMetaContact->handle()); if (err == FALSE) { // ask to delete new contact if (_isNewContact && _hContact != NULL) { -- cgit v1.2.3