diff options
Diffstat (limited to 'plugins/UserInfoEx/src/ex_import')
| -rw-r--r-- | plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp | 6 | ||||
| -rw-r--r-- | plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp | 4 | ||||
| -rw-r--r-- | plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp b/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp index b8d878b188..34eb007d36 100644 --- a/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp +++ b/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp @@ -236,18 +236,18 @@ MCONTACT CExImContactBase::toDB() } // create new contact - _hContact = DB::Contact::Add(); + _hContact = db_add_contact(); if (!_hContact) { return _hContact = INVALID_CONTACT_ID; } // Add the protocol to the new contact if (Proto_AddToContact(_hContact, _pszProto)) { - DB::Contact::Delete(_hContact); + db_delete_contact(_hContact); return _hContact = INVALID_CONTACT_ID; } // write uid to protocol module if (db_set(_hContact, _pszProto, _pszUIDKey, &_dbvUID)) { - DB::Contact::Delete(_hContact); + db_delete_contact(_hContact); return _hContact = INVALID_CONTACT_ID; } // write nick and display name diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp index 4a9b06f82e..c3b8f48f8e 100644 --- a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp +++ b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp @@ -607,7 +607,7 @@ int CExImContactXML::ImportContact() LPGENW("Importing a new contact was aborted!"),
LPGENW("You aborted import of a new contact.\nSome information may be missing for this contact.\n\nDo you want to delete the incomplete contact?"));
if (result == IDYES) {
- DB::Contact::Delete(_hContact);
+ db_delete_contact(_hContact);
_hContact = INVALID_CONTACT_ID;
}
}
@@ -749,7 +749,7 @@ int CExImContactXML::ImportMetaSubContact(CExImContactXML * pMetaContact) MIR_FREE(ptszNick);
MIR_FREE(ptszMetaNick);
if (result == IDYES) {
- DB::Contact::Delete(_hContact);
+ db_delete_contact(_hContact);
_hContact = INVALID_CONTACT_ID;
}
}
diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp index 2ac2aaa37d..aee6a83b5f 100644 --- a/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp +++ b/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp @@ -366,11 +366,11 @@ int CFileXml::Import(MCONTACT hContact, LPCSTR pszFileName) int ret;
// disable database safty mode to speed up the operation
- CallService(MS_DB_SETSAFETYMODE, 0, 0);
+ db_set_safety_mode(0);
// import owner contact
ret = ImportOwner(xmlCard->FirstChildElement(XKEY_OWNER));
// as soon as possible enable safty mode again!
- CallService(MS_DB_SETSAFETYMODE, 1, 0);
+ db_set_safety_mode(1);
if (!ret) {
MsgBox(NULL, MB_ICONINFORMATION,
@@ -395,11 +395,11 @@ int CFileXml::Import(MCONTACT hContact, LPCSTR pszFileName) if (_numContactsTodo > 0) {
_progress.SetContactCount(_numContactsTodo);
// disable database safty mode to speed up the operation
- CallService(MS_DB_SETSAFETYMODE, 0, 0);
+ db_set_safety_mode(0);
// import the contacts
ImportContacts(xmlCard);
// as soon as possible enable safty mode again!
- CallService(MS_DB_SETSAFETYMODE, 1, 0);
+ db_set_safety_mode(1);
}
// finally hide the progress dialog
_progress.Hide();
|