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 --- plugins/FavContacts/src/favlist.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'plugins/FavContacts/src/favlist.h') diff --git a/plugins/FavContacts/src/favlist.h b/plugins/FavContacts/src/favlist.h index dc2dd610e9..40f44b6e6d 100644 --- a/plugins/FavContacts/src/favlist.h +++ b/plugins/FavContacts/src/favlist.h @@ -20,10 +20,10 @@ public: this->bManual = bManual; this->fRate = fRate; name = mir_tstrdup((TCHAR *)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR)); - if (g_Options.bUseGroups && !DBGetContactSettingTString(hContact, "CList", "Group", &dbv)) + if (g_Options.bUseGroups && !db_get_ts(hContact, "CList", "Group", &dbv)) { group = mir_tstrdup(dbv.ptszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } else if (g_Options.bUseGroups) { @@ -32,7 +32,7 @@ public: { group = mir_tstrdup(TranslateT("Favourite Contacts")); } - status = DBGetContactSettingWord(hContact, GetContactProto(hContact), "Status", ID_STATUS_OFFLINE); + status = db_get_w(hContact, GetContactProto(hContact), "Status", ID_STATUS_OFFLINE); } ~TContactInfo() @@ -105,7 +105,7 @@ public: HANDLE hContact = db_find_first(); for ( ; hContact; hContact = db_find_next(hContact)) - if (DBGetContactSettingByte(hContact, "FavContacts", "IsFavourite", 0)) + if (db_get_b(hContact, "FavContacts", "IsFavourite", 0)) { TCHAR *group = addContact(hContact, true)->getGroup(); if (prevGroup && lstrcmp(prevGroup, group)) @@ -118,7 +118,7 @@ public: { hContact = g_contactCache->get(i); if (!hContact) break; - if (!DBGetContactSettingByte(hContact, "FavContacts", "IsFavourite", 0)) + if (!db_get_b(hContact, "FavContacts", "IsFavourite", 0)) { TCHAR *group = addContact(hContact, false)->getGroup(); if (prevGroup && lstrcmp(prevGroup, group)) -- cgit v1.2.3