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 --- plugins/FavContacts/src/http_api.cpp | 2 +- plugins/FavContacts/src/menu.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'plugins/FavContacts/src') diff --git a/plugins/FavContacts/src/http_api.cpp b/plugins/FavContacts/src/http_api.cpp index cc84b08adc..d71e1c536d 100644 --- a/plugins/FavContacts/src/http_api.cpp +++ b/plugins/FavContacts/src/http_api.cpp @@ -52,7 +52,7 @@ public: int hContact; sscanf(s, "/fav/open/%d", &hContact); - if (CallService(MS_DB_CONTACT_IS, hContact, 0)) + if (db_is_contact(hContact)) CallServiceSync(MS_FAVCONTACTS_OPEN_CONTACT, hContact, 0); } diff --git a/plugins/FavContacts/src/menu.cpp b/plugins/FavContacts/src/menu.cpp index 92775dee70..176f645120 100644 --- a/plugins/FavContacts/src/menu.cpp +++ b/plugins/FavContacts/src/menu.cpp @@ -128,7 +128,7 @@ BOOL MenuMeasureItem(LPMEASUREITEMSTRUCT lpmis, Options *options) BOOL res = FALSE; if (INT_PTR(lpmis->itemData) < 0) res = sttMeasureItem_Group(lpmis, options); - else if (CallService(MS_DB_CONTACT_IS, lpmis->itemData, 0)) + else if (db_is_contact(lpmis->itemData)) res = sttMeasureItem_Contact(lpmis, options); if (res && (lpmis->itemWidth > g_maxItemWidth)) lpmis->itemWidth = g_maxItemWidth; @@ -350,7 +350,7 @@ BOOL MenuDrawItem(LPDRAWITEMSTRUCT lpdis, Options *options) if (INT_PTR(lpdis->itemData) < 0) return sttDrawItem_Group(lpdis, options); - if (CallService(MS_DB_CONTACT_IS, lpdis->itemData, 0)) + if (db_is_contact(lpdis->itemData)) return sttDrawItem_Contact(lpdis, options); return FALSE; @@ -419,7 +419,7 @@ static LRESULT CALLBACK MenuHostWndProc(HWND hwnd, UINT message, WPARAM wParam, GetMenuItemInfo((HMENU)lParam, wParam, TRUE, &mii); MCONTACT cc = (MCONTACT)mii.dwItemData; - if (!CallService(MS_DB_CONTACT_IS, cc, 0)) + if (!db_is_contact(cc)) return FALSE; HMENU hMenu = Menu_BuildContactMenu(cc); -- cgit v1.2.3