From 13c033c257f6c083b0c46b4fa28601db5a0b6335 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 27 Feb 2014 20:50:07 +0000 Subject: MS_MC_GETMETACONTACT => db_mc_getMeta git-svn-id: http://svn.miranda-ng.org/main/trunk@8317 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/WhenWasIt/src/dlg_handlers.cpp | 2 +- plugins/WhenWasIt/src/notifiers.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'plugins/WhenWasIt') diff --git a/plugins/WhenWasIt/src/dlg_handlers.cpp b/plugins/WhenWasIt/src/dlg_handlers.cpp index ccf8737629..3fb1dbf078 100644 --- a/plugins/WhenWasIt/src/dlg_handlers.cpp +++ b/plugins/WhenWasIt/src/dlg_handlers.cpp @@ -70,7 +70,7 @@ int EnablePopupsGroup(HWND hWnd, int enable) EnableWindow(GetDlgItem(hWnd, IDC_FOREGROUND), enable); EnableWindow(GetDlgItem(hWnd, IDC_BACKGROUND), enable); EnableWindow(GetDlgItem(hWnd, IDC_NOBIRTHDAYS_POPUP), enable); - EnableWindow(GetDlgItem(hWnd, IDC_IGNORE_SUBCONTACTS), (ServiceExists(MS_MC_GETMETACONTACT)) ? enable : FALSE); + EnableWindow(GetDlgItem(hWnd, IDC_IGNORE_SUBCONTACTS), enable); EnableWindow(GetDlgItem(hWnd, IDC_PREVIEW), enable); EnableWindow(GetDlgItem(hWnd, IDC_LEFT_CLICK), enable); EnableWindow(GetDlgItem(hWnd, IDC_RIGHT_CLICK), enable); diff --git a/plugins/WhenWasIt/src/notifiers.cpp b/plugins/WhenWasIt/src/notifiers.cpp index f6282045a3..83eb7c9c30 100644 --- a/plugins/WhenWasIt/src/notifiers.cpp +++ b/plugins/WhenWasIt/src/notifiers.cpp @@ -67,8 +67,8 @@ TCHAR *BuildDABText(int dab, TCHAR *name, TCHAR *text, int size) int PopupNotifyBirthday(MCONTACT hContact, int dtb, int age) { if (commonData.bIgnoreSubcontacts) { - MCONTACT hMetacontact = (MCONTACT)CallService(MS_MC_GETMETACONTACT, hContact, 0); - if ((hMetacontact) && (hMetacontact != hContact)) //not main metacontact + MCONTACT hMetacontact = db_mc_getMeta(hContact); + if (hMetacontact && hMetacontact != hContact) //not main metacontact return 0; } @@ -110,7 +110,7 @@ int PopupNotifyBirthday(MCONTACT hContact, int dtb, int age) int PopupNotifyMissedBirthday(MCONTACT hContact, int dab, int age) { if (commonData.bIgnoreSubcontacts) { - MCONTACT hMetacontact = (MCONTACT)CallService(MS_MC_GETMETACONTACT, hContact, 0); + MCONTACT hMetacontact = db_mc_getMeta(hContact); if (hMetacontact && hMetacontact != hContact) //not main metacontact return 0; } -- cgit v1.2.3