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/Gadu-Gadu/src/core.cpp | 4 ++-- protocols/Gadu-Gadu/src/groupchat.cpp | 2 +- protocols/Gadu-Gadu/src/services.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'protocols/Gadu-Gadu/src') diff --git a/protocols/Gadu-Gadu/src/core.cpp b/protocols/Gadu-Gadu/src/core.cpp index 8440ab94ab..ffce72b6b5 100644 --- a/protocols/Gadu-Gadu/src/core.cpp +++ b/protocols/Gadu-Gadu/src/core.cpp @@ -1536,7 +1536,7 @@ MCONTACT GGPROTO::getcontact(uin_t uin, int create, int inlist, wchar_t *szNick) if (!create) return NULL; - MCONTACT hContact = (MCONTACT)CallService(MS_DB_CONTACT_ADD, 0, 0); + MCONTACT hContact = db_add_contact(); if (!hContact) { debugLogW(L"getcontact(): Failed to create Gadu-Gadu contact %s", szNick); return NULL; @@ -1544,7 +1544,7 @@ MCONTACT GGPROTO::getcontact(uin_t uin, int create, int inlist, wchar_t *szNick) if (Proto_AddToContact(hContact, m_szModuleName) != 0) { // For some reason we failed to register the protocol for this contact - CallService(MS_DB_CONTACT_DELETE, hContact, 0); + db_delete_contact(hContact); debugLogA("getcontact(): Failed to register GG contact %d", uin); return NULL; } diff --git a/protocols/Gadu-Gadu/src/groupchat.cpp b/protocols/Gadu-Gadu/src/groupchat.cpp index 29f3e39abc..65db400791 100644 --- a/protocols/Gadu-Gadu/src/groupchat.cpp +++ b/protocols/Gadu-Gadu/src/groupchat.cpp @@ -139,7 +139,7 @@ int GGPROTO::gc_event(WPARAM, LPARAM lParam) DBVARIANT dbv; if (!getWString(hContact, "ChatRoomID", &dbv)) { if (dbv.ptszVal && !mir_wstrcmp(gch->pDest->ptszID, dbv.ptszVal)) - CallService(MS_DB_CONTACT_DELETE, hContact, 0); + db_delete_contact(hContact); db_free(&dbv); } hContact = hNext; diff --git a/protocols/Gadu-Gadu/src/services.cpp b/protocols/Gadu-Gadu/src/services.cpp index fbb314a22c..78542d1802 100644 --- a/protocols/Gadu-Gadu/src/services.cpp +++ b/protocols/Gadu-Gadu/src/services.cpp @@ -380,7 +380,7 @@ INT_PTR GGPROTO::get_acc_mgr_gui(WPARAM, LPARAM lParam) INT_PTR GGPROTO::leavechat(WPARAM hContact, LPARAM) { if (hContact) - CallService(MS_DB_CONTACT_DELETE, hContact, 0); + db_delete_contact(hContact); return 0; } -- cgit v1.2.3