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/Yahoo/src/proto.cpp | 2 +- protocols/Yahoo/src/yahoo.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'protocols/Yahoo') diff --git a/protocols/Yahoo/src/proto.cpp b/protocols/Yahoo/src/proto.cpp index ed7e110a8d..353baf3c16 100644 --- a/protocols/Yahoo/src/proto.cpp +++ b/protocols/Yahoo/src/proto.cpp @@ -255,7 +255,7 @@ int CYahooProto::AuthDeny(MEVENT hdbe, const wchar_t *reason) debugLogA("Rejecting buddy:%s msg: %s", who, u_reason); reject(myid, who, getWord(hContact, "yprotoid", 0), u_reason); - CallService(MS_DB_CONTACT_DELETE, hContact); + db_delete_contact(hContact); } } return 0; diff --git a/protocols/Yahoo/src/yahoo.cpp b/protocols/Yahoo/src/yahoo.cpp index 499528b520..5baf2caf4c 100644 --- a/protocols/Yahoo/src/yahoo.cpp +++ b/protocols/Yahoo/src/yahoo.cpp @@ -263,7 +263,7 @@ MCONTACT CYahooProto::add_buddy(const char *yahoo_id, const char *yahoo_name, in //not already there: add LOG(("[add_buddy] Adding buddy id: %s (Nick: %s), flags: %lu", yid, yahoo_name, flags)); - hContact = (MCONTACT)CallService(MS_DB_CONTACT_ADD); + hContact = db_add_contact(); Proto_AddToContact(hContact, m_szModuleName); setString(hContact, YAHOO_LOGINID, yid); Set_Protocol(hContact, protocol); @@ -668,7 +668,7 @@ void CYahooProto::ext_rejected(const char *who, const char *msg) * Make sure the contact is temporary so we could delete it w/o extra traffic */ db_set_b(hContact, "CList", "NotOnList", 1); - CallService(MS_DB_CONTACT_DELETE, hContact); + db_delete_contact(hContact); } else LOG(("[ext_rejected] Buddy not on our buddy list")); @@ -700,7 +700,7 @@ void CYahooProto::ext_buddy_added(char *myid, char *who, char *group, int status ShowPopup(TranslateT("Invalid Contact"), TranslateT("The ID you tried to add is invalid."), NULL); /* Make it TEMP first, we don't want to send any extra packets for FALSE ids */ db_set_b(hContact, "CList", "NotOnList", 1); - CallService(MS_DB_CONTACT_DELETE, hContact); + db_delete_contact(hContact); } break; @@ -710,7 +710,7 @@ void CYahooProto::ext_buddy_added(char *myid, char *who, char *group, int status ShowPopup(TranslateT("Invalid Contact"), TranslateT("Unknown Error."), NULL); /* Make it TEMP first, we don't want to send any extra packets for FALSE ids */ db_set_b(hContact, "CList", "NotOnList", 1); - CallService(MS_DB_CONTACT_DELETE, hContact); + db_delete_contact(hContact); } break; -- cgit v1.2.3