CLIST_INTERFACE::pfnGetStatusModeDescription => Clist_GetStatusModeDescription

7 files changed, 9 insertions, 9 deletions

diff --git a/plugins/TabSRMM/src/chat_window.cpp b/plugins/TabSRMM/src/chat_window.cpp
index 5e282556cb..1dfc61b5bf 100644
--- a/plugins/TabSRMM/src/chat_window.cpp
+++ b/plugins/TabSRMM/src/chat_window.cpp
@@ -965,7 +965,7 @@ void CChatRoomDlg::UpdateTitle()
 	m_hTabStatusIcon = hIcon;
 
 	if (m_cache->getStatus() != m_cache->getOldStatus()) {
-		wcsncpy_s(m_wszStatus, pcli->pfnGetStatusModeDescription(m_wStatus, 0), _TRUNCATE);
+		wcsncpy_s(m_wszStatus, Clist_GetStatusModeDescription(m_wStatus, 0), _TRUNCATE);
 
 		TCITEM item = {};
 		item.mask = TCIF_TEXT;
diff --git a/plugins/TabSRMM/src/eventpopups.cpp b/plugins/TabSRMM/src/eventpopups.cpp
index 8dff9716bb..58fc404227 100644
--- a/plugins/TabSRMM/src/eventpopups.cpp
+++ b/plugins/TabSRMM/src/eventpopups.cpp
@@ -695,7 +695,7 @@ int TSAPI UpdateTrayMenu(const CTabBaseDlg *dat, WORD wStatus, const char *szPro
 		return 0;

 

 	WORD wMyStatus = (wStatus == 0) ? db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE) : wStatus;

-	const wchar_t	*szMyStatus = (szStatus == nullptr) ? pcli->pfnGetStatusModeDescription(wMyStatus, 0) : szStatus;

+	const wchar_t	*szMyStatus = (szStatus == nullptr) ? Clist_GetStatusModeDescription(wMyStatus, 0) : szStatus;

 

 	MENUITEMINFO mii = { 0 };

 	mii.cbSize = sizeof(mii);

diff --git a/plugins/TabSRMM/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp
index 11fb6aa266..7855a24064 100644
--- a/plugins/TabSRMM/src/globals.cpp
+++ b/plugins/TabSRMM/src/globals.cpp
@@ -557,8 +557,8 @@ void CGlobals::logStatusChange(WPARAM wParam, const CContactCache *c)
 	if (wStatus == wOldStatus)

 		return;

 

-	wchar_t *szOldStatus = pcli->pfnGetStatusModeDescription(wOldStatus, 0);

-	wchar_t *szNewStatus = pcli->pfnGetStatusModeDescription(wStatus, 0);

+	wchar_t *szOldStatus = Clist_GetStatusModeDescription(wOldStatus, 0);

+	wchar_t *szNewStatus = Clist_GetStatusModeDescription(wStatus, 0);

 	if (szOldStatus == nullptr || szNewStatus == nullptr)

 		return;

 

diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp
index b7aad94078..9ad0a15ea4 100644
--- a/plugins/TabSRMM/src/msgdialog.cpp
+++ b/plugins/TabSRMM/src/msgdialog.cpp
@@ -632,7 +632,7 @@ void CSrmmWindow::OnInitDialog()
 

 	if (m_hContact && m_szProto != nullptr) {

 		m_wStatus = db_get_w(m_hContact, m_szProto, "Status", ID_STATUS_OFFLINE);

-		wcsncpy_s(m_wszStatus, pcli->pfnGetStatusModeDescription(m_szProto == nullptr ? ID_STATUS_OFFLINE : m_wStatus, 0), _TRUNCATE);

+		wcsncpy_s(m_wszStatus, Clist_GetStatusModeDescription(m_szProto == nullptr ? ID_STATUS_OFFLINE : m_wStatus, 0), _TRUNCATE);

 	}

 	else m_wStatus = ID_STATUS_OFFLINE;

 

@@ -993,7 +993,7 @@ void CSrmmWindow::UpdateTitle()
 			m_dwFlagsEx = m_idle ? m_dwFlagsEx | MWF_SHOW_ISIDLE : m_dwFlagsEx & ~MWF_SHOW_ISIDLE;

 

 			m_wStatus = m_cache->getStatus();

-			wcsncpy_s(m_wszStatus, pcli->pfnGetStatusModeDescription(m_szProto == nullptr ? ID_STATUS_OFFLINE : m_wStatus, 0), _TRUNCATE);

+			wcsncpy_s(m_wszStatus, Clist_GetStatusModeDescription(m_szProto == nullptr ? ID_STATUS_OFFLINE : m_wStatus, 0), _TRUNCATE);

 

 			wchar_t newcontactname[128]; newcontactname[0] = 0;

 			if (PluginConfig.m_bCutContactNameOnTabs)

diff --git a/plugins/TabSRMM/src/msgoptions.cpp b/plugins/TabSRMM/src/msgoptions.cpp
index e87aa97f88..3924e7968c 100644
--- a/plugins/TabSRMM/src/msgoptions.cpp
+++ b/plugins/TabSRMM/src/msgoptions.cpp
@@ -1527,7 +1527,7 @@ INT_PTR CALLBACK DlgProcSetupStatusModes(HWND hwndDlg, UINT msg, WPARAM wParam,
 		SetWindowText(hwndDlg, TranslateT("Choose status modes"));

 		{

 			for (int i = ID_STATUS_ONLINE; i <= ID_STATUS_OUTTOLUNCH; i++) {

-				SetDlgItemText(hwndDlg, i, pcli->pfnGetStatusModeDescription(i, 0));

+				SetDlgItemText(hwndDlg, i, Clist_GetStatusModeDescription(i, 0));

 				if (dwStatusMask != -1 && (dwStatusMask & (1 << (i - ID_STATUS_ONLINE))))

 					CheckDlgButton(hwndDlg, i, BST_CHECKED);

 				Utils::enableDlgControl(hwndDlg, i, dwStatusMask != -1);

diff --git a/plugins/TabSRMM/src/msgs.cpp b/plugins/TabSRMM/src/msgs.cpp
index 57a8b76483..bfa2da6059 100644
--- a/plugins/TabSRMM/src/msgs.cpp
+++ b/plugins/TabSRMM/src/msgs.cpp
@@ -590,7 +590,7 @@ HWND TSAPI CreateNewTabForContact(TContainerData *pContainer, MCONTACT hContact,
 	}

 	else wcsncpy_s(newcontactname, L"_U_", _TRUNCATE);

 

-	wchar_t *szStatus = pcli->pfnGetStatusModeDescription(szProto == nullptr ? ID_STATUS_OFFLINE : db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE), 0);

+	wchar_t *szStatus = Clist_GetStatusModeDescription(szProto == nullptr ? ID_STATUS_OFFLINE : db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE), 0);

 

 	if (PluginConfig.m_bStatusOnTabs)

 		mir_snwprintf(tabtitle, L"%s (%s)", newcontactname, szStatus);

diff --git a/plugins/TabSRMM/src/trayicon.cpp b/plugins/TabSRMM/src/trayicon.cpp
index 2c12278a9a..7128879516 100644
--- a/plugins/TabSRMM/src/trayicon.cpp
+++ b/plugins/TabSRMM/src/trayicon.cpp
@@ -204,7 +204,7 @@ void TSAPI AddContactToFavorites(MCONTACT hContact, const wchar_t *szNickname, c
 		wStatus = db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE);

 

 	if (szStatus == nullptr)

-		szStatus = pcli->pfnGetStatusModeDescription(wStatus, 0);

+		szStatus = Clist_GetStatusModeDescription(wStatus, 0);

 

 	if (hIcon == nullptr)

 		hIcon = Skin_LoadProtoIcon(szProto, wStatus);