From 7bdb598e26e7e98788933af43090d34027166969 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 14 Sep 2016 18:01:49 +0000 Subject: 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 --- protocols/AimOscar/src/proto.cpp | 2 +- protocols/AimOscar/src/server.cpp | 2 +- protocols/AimOscar/src/utility.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'protocols/AimOscar') diff --git a/protocols/AimOscar/src/proto.cpp b/protocols/AimOscar/src/proto.cpp index f4c9580841..f3dbb61265 100644 --- a/protocols/AimOscar/src/proto.cpp +++ b/protocols/AimOscar/src/proto.cpp @@ -673,7 +673,7 @@ int __cdecl CAimProto::OnEvent(PROTOEVENTTYPE eventType, WPARAM wParam, LPARAM l case EV_PROTO_ONERASE: char szDbsettings[64]; mir_snprintf(szDbsettings, "%sP2P", m_szModuleName); - DbModule_Delete(0, szDbsettings); + db_delete_module(0, szDbsettings); break; case EV_PROTO_ONCONTACTDELETED: diff --git a/protocols/AimOscar/src/server.cpp b/protocols/AimOscar/src/server.cpp index a41ea0d5ce..50bddbceb9 100644 --- a/protocols/AimOscar/src/server.cpp +++ b/protocols/AimOscar/src/server.cpp @@ -889,7 +889,7 @@ void CAimProto::delete_ssi_list(SNAC &snac, int &offset) } } if (i == 1) - CallService(MS_DB_CONTACT_DELETE, hContact, 0); + db_delete_contact(hContact); break; case 0x0001: //group record diff --git a/protocols/AimOscar/src/utility.cpp b/protocols/AimOscar/src/utility.cpp index 69c60f9cfc..6ac3457ed4 100755 --- a/protocols/AimOscar/src/utility.cpp +++ b/protocols/AimOscar/src/utility.cpp @@ -197,7 +197,7 @@ MCONTACT CAimProto::contact_from_sn(const char* sn, bool addIfNeeded, bool tempo } if (addIfNeeded) { - MCONTACT hContact = (MCONTACT)CallService(MS_DB_CONTACT_ADD, 0, 0); + MCONTACT hContact = db_add_contact(); if (hContact) { if (Proto_AddToContact(hContact, m_szModuleName) == 0) { setString(hContact, AIM_KEY_SN, norm_sn); @@ -207,7 +207,7 @@ MCONTACT CAimProto::contact_from_sn(const char* sn, bool addIfNeeded, bool tempo db_set_b(hContact, "CList", "NotOnList", 1); return hContact; } - CallService(MS_DB_CONTACT_DELETE, hContact, 0); + db_delete_contact(hContact); } } -- cgit v1.2.3