GetContactProto: useless duplicate function replaced with standard Proto_GetBaseAccountName

12 files changed, 17 insertions, 17 deletions

diff --git a/plugins/TabSRMM/src/contactcache.cpp b/plugins/TabSRMM/src/contactcache.cpp
index b090a201b6..53eeea1481 100644
--- a/plugins/TabSRMM/src/contactcache.cpp
+++ b/plugins/TabSRMM/src/contactcache.cpp
@@ -129,7 +129,7 @@ void CContactCache::updateMeta()
 	if (m_isValid) {
 		MCONTACT hOldSub = m_hSub;
 		m_hSub = db_mc_getSrmmSub(cc->contactID);
-		m_szMetaProto = GetContactProto(m_hSub);
+		m_szMetaProto = Proto_GetBaseAccountName(m_hSub);
 		m_iMetaStatus = (WORD)db_get_w(m_hSub, m_szMetaProto, "Status", ID_STATUS_OFFLINE);
 		PROTOACCOUNT *pa = Proto_GetAccount(m_szMetaProto);
 		if (pa)
diff --git a/plugins/TabSRMM/src/container.cpp b/plugins/TabSRMM/src/container.cpp
index 989946c157..02223db5c0 100644
--- a/plugins/TabSRMM/src/container.cpp
+++ b/plugins/TabSRMM/src/container.cpp
@@ -1348,7 +1348,7 @@ panel_found:
 				break;

 			case ID_TABMENU_LEAVECHATROOM:

 				if (dat && dat->isChat() && dat->m_hContact) {

-					char *szProto = GetContactProto(dat->m_hContact);

+					char *szProto = Proto_GetBaseAccountName(dat->m_hContact);

 					if (szProto)

 						CallProtoService(szProto, PS_LEAVECHAT, dat->m_hContact, 0);

 				}

diff --git a/plugins/TabSRMM/src/generic_msghandlers.cpp b/plugins/TabSRMM/src/generic_msghandlers.cpp
index 724b062375..81ed720086 100644
--- a/plugins/TabSRMM/src/generic_msghandlers.cpp
+++ b/plugins/TabSRMM/src/generic_msghandlers.cpp
@@ -633,7 +633,7 @@ void CMsgDialog::DM_SetDBButtonStates()
 				continue;
 			}
 			if (buttonItem->dwFlags & BUTTON_ISCONTACTDBACTION)
-				szModule = GetContactProto(m_hContact);
+				szModule = Proto_GetBaseAccountName(m_hContact);
 			hFinalContact = m_hContact;
 		}
 		else hFinalContact = 0;
diff --git a/plugins/TabSRMM/src/hotkeyhandler.cpp b/plugins/TabSRMM/src/hotkeyhandler.cpp
index dab38a84a2..ca5759c1e8 100644
--- a/plugins/TabSRMM/src/hotkeyhandler.cpp
+++ b/plugins/TabSRMM/src/hotkeyhandler.cpp
@@ -362,7 +362,7 @@ LONG_PTR CALLBACK HotkeyHandlerDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 					else

 						SendMessage(hWnd, WM_CLOSE, 0, 1);

 

-					char *szProto = GetContactProto(lParam);

+					char *szProto = Proto_GetBaseAccountName(lParam);

 					if (szProto != nullptr && db_get_b(lParam, szProto, "ChatRoom", 0))

 						ShowRoom((TContainerData*)wParam, SM_FindSessionByHCONTACT(lParam));

 					else

diff --git a/plugins/TabSRMM/src/mim.cpp b/plugins/TabSRMM/src/mim.cpp
index 63a577702d..984d8bd1c0 100644
--- a/plugins/TabSRMM/src/mim.cpp
+++ b/plugins/TabSRMM/src/mim.cpp
@@ -349,7 +349,7 @@ int CMimAPI::PrebuildContactMenu(WPARAM hContact, LPARAM)
 		return 0;
 
 	bool bEnabled = false;
-	char *szProto = GetContactProto(hContact);
+	char *szProto = Proto_GetBaseAccountName(hContact);
 	if (szProto) {
 		// leave this menu item hidden for chats
 		if (!db_get_b(hContact, szProto, "ChatRoom", 0))
@@ -472,9 +472,9 @@ int CMimAPI::MessageEventAdded(WPARAM hContact, LPARAM hDbEvent)
 	if (dwStatusMask == -1)
 		bAllowAutoCreate = true;
 	else {
-		char *szProto = GetContactProto(hContact);
+		char *szProto = Proto_GetBaseAccountName(hContact);
 		if (szProto && !mir_strcmp(szProto, META_PROTO))
-			szProto = GetContactProto(db_mc_getSrmmSub(hContact));
+			szProto = Proto_GetBaseAccountName(db_mc_getSrmmSub(hContact));
 
 		if (szProto) {
 			int dwStatus = Proto_GetStatus(szProto);
diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp
index bca0840c84..5111009456 100644
--- a/plugins/TabSRMM/src/msgdialog.cpp
+++ b/plugins/TabSRMM/src/msgdialog.cpp
@@ -360,7 +360,7 @@ CMsgDialog::CMsgDialog(SESSION_INFO *si) :
 

 void CMsgDialog::Init()

 {

-	m_szProto = GetContactProto(m_hContact);

+	m_szProto = Proto_GetBaseAccountName(m_hContact);

 	m_autoClose = CLOSE_ON_CANCEL;

 	m_forceResizable = true;

 	m_bFilterEnabled = db_get_b(m_hContact, CHAT_MODULE, "FilterEnabled", m_bFilterEnabled) != 0;

diff --git a/plugins/TabSRMM/src/msgdlgother.cpp b/plugins/TabSRMM/src/msgdlgother.cpp
index 72fcc8ca6a..d4ca925009 100644
--- a/plugins/TabSRMM/src/msgdlgother.cpp
+++ b/plugins/TabSRMM/src/msgdlgother.cpp
@@ -1095,7 +1095,7 @@ int CMsgDialog::MsgWindowMenuHandler(int selection, int menuId)
 			break;
 		case ID_TABMENU_LEAVECHATROOM:
 			if (isChat() && m_hContact != 0) {
-				char *szProto = GetContactProto(m_hContact);
+				char *szProto = Proto_GetBaseAccountName(m_hContact);
 				if (szProto)
 					CallProtoService(szProto, PS_LEAVECHAT, m_hContact, 0);
 			}
diff --git a/plugins/TabSRMM/src/msgs.cpp b/plugins/TabSRMM/src/msgs.cpp
index ed1c11e543..e60ae9077a 100644
--- a/plugins/TabSRMM/src/msgs.cpp
+++ b/plugins/TabSRMM/src/msgs.cpp
@@ -158,7 +158,7 @@ INT_PTR SendMessageCommand_Worker(MCONTACT hContact, LPCSTR pszMsg, bool isWchar
 	}

 

 	// does the MCONTACT's protocol support IM messages?

-	char *szProto = GetContactProto(hContact);

+	char *szProto = Proto_GetBaseAccountName(hContact);

 	if (szProto == nullptr)

 		return 0; // unknown contact

 	if (0 == (CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_IMSEND))

@@ -325,7 +325,7 @@ HWND TSAPI CreateNewTabForContact(TContainerData *pContainer, MCONTACT hContact,
 			if ((pContainer = CreateContainer(L"default", CNT_CREATEFLAG_CLONED, hContact)) == nullptr)

 				return nullptr;

 

-	char *szProto = GetContactProto(hContact);

+	char *szProto = Proto_GetBaseAccountName(hContact);

 

 	// obtain various status information about the contact

 	wchar_t *contactName = Clist_GetContactDisplayName(hContact);

diff --git a/plugins/TabSRMM/src/sendlater.cpp b/plugins/TabSRMM/src/sendlater.cpp
index 456f10b32e..aecb09cb96 100644
--- a/plugins/TabSRMM/src/sendlater.cpp
+++ b/plugins/TabSRMM/src/sendlater.cpp
@@ -438,7 +438,7 @@ HANDLE CSendLater::processAck(const ACKDATA *ack)
 				DBEVENTINFO dbei = {};

 				dbei.eventType = EVENTTYPE_MESSAGE;

 				dbei.flags = DBEF_SENT | DBEF_UTF;

-				dbei.szModule = GetContactProto((p->hContact));

+				dbei.szModule = Proto_GetBaseAccountName((p->hContact));

 				dbei.timestamp = time(0);

 				dbei.cbBlob = (int)mir_strlen(p->sendBuffer) + 1;

 				dbei.pBlob = (PBYTE)(p->sendBuffer);

diff --git a/plugins/TabSRMM/src/sendqueue.cpp b/plugins/TabSRMM/src/sendqueue.cpp
index e669e0dd54..0af8e31652 100644
--- a/plugins/TabSRMM/src/sendqueue.cpp
+++ b/plugins/TabSRMM/src/sendqueue.cpp
@@ -461,7 +461,7 @@ int SendQueue::ackMessage(CMsgDialog *dat, WPARAM wParam, LPARAM lParam)
 	DBEVENTINFO dbei = {};
 	dbei.eventType = EVENTTYPE_MESSAGE;
 	dbei.flags = DBEF_SENT | DBEF_UTF;
-	dbei.szModule = GetContactProto(job.hContact);
+	dbei.szModule = Proto_GetBaseAccountName(job.hContact);
 	dbei.timestamp = time(0);
 	dbei.cbBlob = (int)mir_strlen(job.szSendBuffer) + 1;
 
@@ -553,7 +553,7 @@ int SendQueue::doSendLater(int iJobIndex, CMsgDialog *dat, MCONTACT hContact, bo
 		DBEVENTINFO dbei = {};
 		dbei.eventType = EVENTTYPE_MESSAGE;
 		dbei.flags = DBEF_SENT | DBEF_UTF;
-		dbei.szModule = GetContactProto(dat->m_hContact);
+		dbei.szModule = Proto_GetBaseAccountName(dat->m_hContact);
 		dbei.timestamp = time(0);
 		dbei.cbBlob = (int)mir_strlen(utfText) + 1;
 		dbei.pBlob = (PBYTE)(char*)utfText;
diff --git a/plugins/TabSRMM/src/templates.cpp b/plugins/TabSRMM/src/templates.cpp
index b168691a1d..cf511c431d 100644
--- a/plugins/TabSRMM/src/templates.cpp
+++ b/plugins/TabSRMM/src/templates.cpp
@@ -148,10 +148,10 @@ bool CTemplateEditDlg::OnInitDialog()
 	// set hContact to the first found contact so that we can use the Preview window properly
 	// also, set other parameters needed by the streaming function to display events
 	m_hContact = db_find_first();
-	m_szProto = GetContactProto(m_hContact);
+	m_szProto = Proto_GetBaseAccountName(m_hContact);
 	while (m_szProto == nullptr && m_hContact != 0) {
 		m_hContact = db_find_next(m_hContact);
-		m_szProto = GetContactProto(m_hContact);
+		m_szProto = Proto_GetBaseAccountName(m_hContact);
 	}
 	m_dwFlags = m_pContainer->m_theme.dwFlags;
 
diff --git a/plugins/TabSRMM/src/trayicon.cpp b/plugins/TabSRMM/src/trayicon.cpp
index 2e1f498fa5..d7d53ff89f 100644
--- a/plugins/TabSRMM/src/trayicon.cpp
+++ b/plugins/TabSRMM/src/trayicon.cpp
@@ -196,7 +196,7 @@ void TSAPI AddContactToFavorites(MCONTACT hContact, const wchar_t *szNickname, c
 		wcsncpy_s(szFinalNick, szNickname, _TRUNCATE);

 

 	if (szProto == nullptr)

-		szProto = GetContactProto(hContact);

+		szProto = Proto_GetBaseAccountName(hContact);

 	if (szProto == nullptr)

 		return;