From 007b4c7301f0d26a72f89f74e9929f42e24eb3e6 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 5 Apr 2013 22:27:16 +0000 Subject: - rest of menus cleared; - old database macroses wiped out from all plugins (left in m_database.h for compatibility) git-svn-id: http://svn.miranda-ng.org/main/trunk@4324 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/modules/clist/contacts.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/modules/clist/contacts.cpp') diff --git a/src/modules/clist/contacts.cpp b/src/modules/clist/contacts.cpp index bcc2b6091a..d15bbd5e6c 100644 --- a/src/modules/clist/contacts.cpp +++ b/src/modules/clist/contacts.cpp @@ -49,9 +49,9 @@ static int GetDatabaseString(CONTACTINFO *ci, const char* setting, DBVARIANT* db } if (ci->dwFlag & CNF_UNICODE) - return DBGetContactSettingWString(ci->hContact, ci->szProto, setting, dbv); + return db_get_ws(ci->hContact, ci->szProto, setting, dbv); - return DBGetContactSettingString(ci->hContact, ci->szProto, setting, dbv); + return db_get_s(ci->hContact, ci->szProto, setting, dbv); } static int ProcessDatabaseValueDefault(CONTACTINFO *ci, const char* setting) @@ -70,7 +70,7 @@ static int ProcessDatabaseValueDefault(CONTACTINFO *ci, const char* setting) db_free(&dbv); } - if (DBGetContactSetting(ci->hContact, ci->szProto, setting, &dbv)) + if (db_get(ci->hContact, ci->szProto, setting, &dbv)) return 1; switch (dbv.type) { @@ -146,7 +146,7 @@ static INT_PTR GetContactInfo(WPARAM, LPARAM lParam) { if ( !GetDatabaseString(ci, (ci->dwFlag & 0x7F) == CNF_COUNTRY ? "CountryName" : "CompanyCountryName", &dbv)) return 0; - if ( !DBGetContactSetting(ci->hContact, ci->szProto, (ci->dwFlag & 0x7F) == CNF_COUNTRY ? "Country" : "CompanyCountry", &dbv)) { + if ( !db_get(ci->hContact, ci->szProto, (ci->dwFlag & 0x7F) == CNF_COUNTRY ? "Country" : "CompanyCountry", &dbv)) { if (dbv.type == DBVT_WORD) { int i, countryCount; struct CountryListEntry *countries; @@ -513,7 +513,7 @@ int LoadContactsModule(void) nameOrder[i] = i; DBVARIANT dbv; - if ( !DBGetContactSetting(NULL, "Contact", "NameOrder", &dbv)) { + if ( !db_get(NULL, "Contact", "NameOrder", &dbv)) { CopyMemory(nameOrder, dbv.pbVal, dbv.cpbVal); db_free(&dbv); } -- cgit v1.2.3