From 6be9b9c1dd00da5ecd33cbc20ece4162ba56c402 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 19 Jul 2014 14:11:25 +0000 Subject: db_mc_tryMeta applied git-svn-id: http://svn.miranda-ng.org/main/trunk@9860 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/WhenWasIt/src/notifiers.cpp | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'plugins/WhenWasIt') diff --git a/plugins/WhenWasIt/src/notifiers.cpp b/plugins/WhenWasIt/src/notifiers.cpp index 83eb7c9c30..89ef77dafe 100644 --- a/plugins/WhenWasIt/src/notifiers.cpp +++ b/plugins/WhenWasIt/src/notifiers.cpp @@ -66,11 +66,8 @@ TCHAR *BuildDABText(int dab, TCHAR *name, TCHAR *text, int size) int PopupNotifyBirthday(MCONTACT hContact, int dtb, int age) { - if (commonData.bIgnoreSubcontacts) { - MCONTACT hMetacontact = db_mc_getMeta(hContact); - if (hMetacontact && hMetacontact != hContact) //not main metacontact - return 0; - } + if (commonData.bIgnoreSubcontacts && db_mc_isSub(hContact)) + return 0; TCHAR *name = pcli->pfnGetContactDisplayName(hContact, 0); @@ -109,11 +106,8 @@ int PopupNotifyBirthday(MCONTACT hContact, int dtb, int age) int PopupNotifyMissedBirthday(MCONTACT hContact, int dab, int age) { - if (commonData.bIgnoreSubcontacts) { - MCONTACT hMetacontact = db_mc_getMeta(hContact); - if (hMetacontact && hMetacontact != hContact) //not main metacontact - return 0; - } + if (commonData.bIgnoreSubcontacts && db_mc_isSub(hContact)) + return 0; TCHAR *name = pcli->pfnGetContactDisplayName(hContact, 0); -- cgit v1.2.3