GetContactProto: useless duplicate function replaced with standard Proto_GetBaseAccountName

3 files changed, 7 insertions, 7 deletions

diff --git a/plugins/IEView/src/HTMLBuilder.cpp b/plugins/IEView/src/HTMLBuilder.cpp
index 5ec5978cb1..e6feba005d 100644
--- a/plugins/IEView/src/HTMLBuilder.cpp
+++ b/plugins/IEView/src/HTMLBuilder.cpp
@@ -109,7 +109,7 @@ const char* HTMLBuilder::getRealProto(MCONTACT hContact)
 	if (hContact == NULL)

 		return nullptr;

 

-	return GetContactProto(getRealContact(hContact));

+	return Proto_GetBaseAccountName(getRealContact(hContact));

 }

 

 MCONTACT HTMLBuilder::getRealContact(MCONTACT hContact)

@@ -192,7 +192,7 @@ void HTMLBuilder::appendEventOld(IEView *view, IEVIEWEVENT *event)
 	MEVENT hDbEvent = event->hDbEventFirst;

 	event->hDbEventFirst = NULL;

 

-	const char *szProto = GetContactProto(event->hContact);

+	const char *szProto = Proto_GetBaseAccountName(event->hContact);

 

 	IEVIEWEVENT newEvent = {};

 	newEvent.iType = IEE_LOG_MEM_EVENTS;

@@ -339,7 +339,7 @@ void HTMLBuilder::clear(IEView *view, IEVIEWEVENT *event)
 	if (event != nullptr) {

 		setLastIEViewEvent(event);

 

-		if (event->hContact == NULL || GetContactProto(lastIEViewEvent.hContact))

+		if (event->hContact == NULL || Proto_GetBaseAccountName(lastIEViewEvent.hContact))

 			buildHead(view, &lastIEViewEvent);

 	}

 }

diff --git a/plugins/IEView/src/TemplateHTMLBuilder.cpp b/plugins/IEView/src/TemplateHTMLBuilder.cpp
index df46c30801..91ec9309ff 100644
--- a/plugins/IEView/src/TemplateHTMLBuilder.cpp
+++ b/plugins/IEView/src/TemplateHTMLBuilder.cpp
@@ -120,7 +120,7 @@ void TemplateHTMLBuilder::buildHeadTemplate(IEView *view, IEVIEWEVENT *event, Pr
 	char *szStatusMsg = nullptr;

 

 	MCONTACT hRealContact = getRealContact(event->hContact);

-	const char *szRealProto = GetContactProto(hRealContact);

+	const char *szRealProto = Proto_GetBaseAccountName(hRealContact);

 

 	TemplateMap *tmpm = getTemplateMap(protoSettings);

 	if (tmpm == nullptr)

@@ -285,8 +285,8 @@ void TemplateHTMLBuilder::appendEventTemplate(IEView *view, IEVIEWEVENT *event,
 	bool isGrouping = false;

 

 	MCONTACT hRealContact = getRealContact(event->hContact);

-	const char *szRealProto = GetContactProto(hRealContact);

-	const char *szProto = GetContactProto(event->hContact);

+	const char *szRealProto = Proto_GetBaseAccountName(hRealContact);

+	const char *szProto = Proto_GetBaseAccountName(event->hContact);

 	tempBase[0] = '\0';

 

 	TemplateMap *tmpm = getTemplateMap(protoSettings);

diff --git a/plugins/IEView/src/TextToken.cpp b/plugins/IEView/src/TextToken.cpp
index 21c2e8452d..f5956261e9 100644
--- a/plugins/IEView/src/TextToken.cpp
+++ b/plugins/IEView/src/TextToken.cpp
@@ -291,7 +291,7 @@ TextToken* TextToken::tokenizeSmileys(MCONTACT hContact, const wchar_t *text, bo
 

 	SMADD_BATCHPARSE2 sp;

 	sp.cbSize = sizeof(sp);

-	sp.Protocolname = GetContactProto(hContact);

+	sp.Protocolname = Proto_GetBaseAccountName(hContact);

 	sp.flag = SAFL_PATH | SAFL_UNICODE | (isSent ? SAFL_OUTGOING : 0);

 	sp.wstr = (wchar_t *)text;

 	sp.hContact = hContact;