db_mc_tryMeta applied

git-svn-id: http://svn.miranda-ng.org/main/trunk@9860 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 1 insertions, 15 deletions

diff --git a/plugins/Nudge/src/main.cpp b/plugins/Nudge/src/main.cpp
index 9605bb1072..03f5628709 100644
--- a/plugins/Nudge/src/main.cpp
+++ b/plugins/Nudge/src/main.cpp
@@ -430,7 +430,7 @@ int Preview()
 

 void Nudge_ShowPopup(CNudgeElement n, MCONTACT hContact, TCHAR * Message)

 {

-	hContact = Nudge_GethContact(hContact);

+	hContact = db_mc_tryMeta(hContact);

 	TCHAR * lpzContactName = (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, hContact, GCDNF_TCHAR);

 

 	if (ServiceExists(MS_POPUP_ADDPOPUPCLASS)) {

@@ -473,11 +473,6 @@ void Nudge_SentStatus(CNudgeElement n, MCONTACT hContact)
 	dbei.eventType = 1;

 	dbei.cbBlob = (DWORD)strlen(buff) + 1;

 	dbei.pBlob = (PBYTE)buff;

-

-	MCONTACT hMetaContact = db_mc_getMeta(hContact);

-	if (hMetaContact != NULL) // metacontact

-		db_event_add(hMetaContact, &dbei);

-

 	db_event_add(hContact, &dbei);

 	mir_free(buff);

 }

@@ -497,15 +492,6 @@ void Nudge_ShowStatus(CNudgeElement n, MCONTACT hContact, DWORD timestamp)
 	mir_free(buff);

 }

 

-MCONTACT Nudge_GethContact(MCONTACT hContact)

-{

-	MCONTACT hMetaContact = db_mc_getMeta(hContact);

-	if (hMetaContact != NULL)

-		return hMetaContact;

-

-	return hContact;

-}

-

 void Nudge_AddAccount(PROTOACCOUNT *proto)

 {

 	char str[MAXMODULELABELLENGTH + 10];