From e4a8fd6f323b262018bae68bfe87da65cf2092c0 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 19 Jul 2014 13:19:40 +0000 Subject: db_mc_tryMeta - returns parent hContact for a subcontact or hContact itself if it's not a sub git-svn-id: http://svn.miranda-ng.org/main/trunk@9859 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- include/delphi/m_metacontacts.inc | 4 ++++ include/m_metacontacts.h | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/delphi/m_metacontacts.inc b/include/delphi/m_metacontacts.inc index ece131c1a6..46becec44c 100644 --- a/include/delphi/m_metacontacts.inc +++ b/include/delphi/m_metacontacts.inc @@ -94,6 +94,10 @@ function db_mc_getDefaultNum(hContact:TMCONTACT):int; stdcall; function db_mc_getMeta(hContact:TMCONTACT):TMCONTACT; stdcall; external CoreDLL name 'db_mc_getMeta'; +{ returns a meta contact for a subcontact or hContact itself otherwise } +function db_mc_tryMeta(hContact:TMCONTACT):TMCONTACT; stdcall; + external CoreDLL name 'db_mc_tryMeta'; + { returns a subcontact with the given index or 0 } function db_mc_getSub(hContact:TMCONTACT; idx:int):TMCONTACT; stdcall; external CoreDLL name 'db_mc_getSub'; diff --git a/include/m_metacontacts.h b/include/m_metacontacts.h index 9ba80dd801..22bc991815 100644 --- a/include/m_metacontacts.h +++ b/include/m_metacontacts.h @@ -101,9 +101,12 @@ MIR_CORE_DLL(int) db_mc_getDefaultNum(MCONTACT hMetaContact); //returns the number of subcontacts, or -1 on failure MIR_CORE_DLL(int) db_mc_getSubCount(MCONTACT hMetaContact); -// returns parent hContact for a subcontact or INVALID_CONTACT_ID if it's not a sub +// returns parent hContact for a subcontact or NULL if it's not a sub MIR_CORE_DLL(MCONTACT) db_mc_getMeta(MCONTACT hSubContact); +// returns parent hContact for a subcontact or hContact itself if it's not a sub +MIR_CORE_DLL(MCONTACT) db_mc_tryMeta(MCONTACT hContact); + // returns a subcontact with the given index MIR_CORE_DLL(MCONTACT) db_mc_getSub(MCONTACT hMetaContact, int iNum); -- cgit v1.2.3