CLIST_INTERFACE::pfnGetStatusModeDescription => Clist_GetStatusModeDescription

5 files changed, 8 insertions, 8 deletions

diff --git a/plugins/Clist_nicer/src/clistevents.cpp b/plugins/Clist_nicer/src/clistevents.cpp
index 4f3cfee501..bc970f3aa0 100644
--- a/plugins/Clist_nicer/src/clistevents.cpp
+++ b/plugins/Clist_nicer/src/clistevents.cpp
@@ -258,7 +258,7 @@ CListEvent* AddEvent(CLISTEVENT *cle)
 			NotifyMenuItemExData *nmi = (NotifyMenuItemExData*)malloc(sizeof(NotifyMenuItemExData));

 			if (nmi) {

 				wchar_t szBuffer[128];

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

+				wchar_t* szStatus = Clist_GetStatusModeDescription(db_get_w(p->hContact, szProto, "Status", ID_STATUS_OFFLINE), 0);

 

 				wchar_t szwProto[64];

 				MultiByteToWideChar(CP_ACP, 0, szProto, -1, szwProto, 64);

diff --git a/plugins/Clist_nicer/src/clui.cpp b/plugins/Clist_nicer/src/clui.cpp
index b2014121ae..a718231025 100644
--- a/plugins/Clist_nicer/src/clui.cpp
+++ b/plugins/Clist_nicer/src/clui.cpp
@@ -255,7 +255,7 @@ static void InitIcoLib()
 	for (int i = IDI_OVL_OFFLINE; i <= IDI_OVL_OUTTOLUNCH; i++) {
 		char szBuffer[128];
 		mir_snprintf(szBuffer, "cln_ovl_%d", ID_STATUS_OFFLINE + (i - IDI_OVL_OFFLINE));
-		IconItemT icon = { pcli->pfnGetStatusModeDescription(ID_STATUS_OFFLINE + (i - IDI_OVL_OFFLINE), 0), szBuffer, i };
+		IconItemT icon = { Clist_GetStatusModeDescription(ID_STATUS_OFFLINE + (i - IDI_OVL_OFFLINE), 0), szBuffer, i };
 		Icon_RegisterT(g_hInst, LPGENW("Contact list") L"/" LPGENW("Overlay icons"), &icon, 1);
 	}
 
@@ -798,7 +798,7 @@ LRESULT CALLBACK ContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l
 		CluiProtocolStatusChanged(0, nullptr);
 
 		for (int i = ID_STATUS_OFFLINE; i <= ID_STATUS_OUTTOLUNCH; i++)
-			statusNames[i - ID_STATUS_OFFLINE] = pcli->pfnGetStatusModeDescription(i, 0);
+			statusNames[i - ID_STATUS_OFFLINE] = Clist_GetStatusModeDescription(i, 0);
 
 		//delay creation of CLC so that it can get the status icons right the first time (needs protocol modules loaded)
 		if (cfg::dat.bLayeredHack) {
@@ -1708,7 +1708,7 @@ buttons_done:
 					x += textSize.cx;
 				}
 				if (showOpts & 4) {
-					wchar_t *szStatus = pcli->pfnGetStatusModeDescription(status, 0);
+					wchar_t *szStatus = Clist_GetStatusModeDescription(status, 0);
 					GetTextExtentPoint32(dis->hDC, szStatus, (int)mir_wstrlen(szStatus), &textSize);
 					TextOut(dis->hDC, x, (dis->rcItem.top + dis->rcItem.bottom - textSize.cy) >> 1, szStatus, (int)mir_wstrlen(szStatus));
 				}
diff --git a/plugins/Clist_nicer/src/cluiservices.cpp b/plugins/Clist_nicer/src/cluiservices.cpp
index c5567303d9..bc2f0fbfd8 100644
--- a/plugins/Clist_nicer/src/cluiservices.cpp
+++ b/plugins/Clist_nicer/src/cluiservices.cpp
@@ -126,7 +126,7 @@ void CluiProtocolStatusChanged(int, const char*)
 				x += textSize.cx + GetSystemMetrics(SM_CXBORDER) * 4; // The SB panel doesnt allocate enough room

 			}

 			if (showOpts & 4) {

-				wchar_t* modeDescr = pcli->pfnGetStatusModeDescription(CallProtoService(accs[i]->szModuleName, PS_GETSTATUS, 0, 0), 0);

+				wchar_t* modeDescr = Clist_GetStatusModeDescription(CallProtoService(accs[i]->szModuleName, PS_GETSTATUS, 0, 0), 0);

 				GetTextExtentPoint32(hdc, modeDescr, (int)mir_wstrlen(modeDescr), &textSize);

 				x += textSize.cx + GetSystemMetrics(SM_CXBORDER) * 4; // The SB panel doesnt allocate enough room

 			}

@@ -206,7 +206,7 @@ void CluiProtocolStatusChanged(int, const char*)
 	* and uses timer based sort and redraw handling. This can improve performance

 	* when connecting multiple protocols significantly.

 	*/

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

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

 

 	/*

 	* set the global status icon and display the global (most online) status mode on the

diff --git a/plugins/Clist_nicer/src/statusbar.cpp b/plugins/Clist_nicer/src/statusbar.cpp
index 256a914f09..16ab1a814f 100644
--- a/plugins/Clist_nicer/src/statusbar.cpp
+++ b/plugins/Clist_nicer/src/statusbar.cpp
@@ -161,7 +161,7 @@ LRESULT CALLBACK NewStatusBarWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 

 							wchar_t szTipText[256];

 							mir_snwprintf(szTipText, L"<b>%s</b>: %s%s",

-								PD->RealName, pcli->pfnGetStatusModeDescription(wStatus, 0), isLocked ? L"  (LOCKED)" : L"");

+								PD->RealName, Clist_GetStatusModeDescription(wStatus, 0), isLocked ? L"  (LOCKED)" : L"");

 

 							CLCINFOTIP ti = { sizeof(ti) };

 							ti.isTreeFocused = (GetFocus() == pcli->hwndContactList);

diff --git a/plugins/Clist_nicer/src/viewmodes.cpp b/plugins/Clist_nicer/src/viewmodes.cpp
index 1939f5ec24..93e3756e0d 100644
--- a/plugins/Clist_nicer/src/viewmodes.cpp
+++ b/plugins/Clist_nicer/src/viewmodes.cpp
@@ -206,7 +206,7 @@ static int FillDialog(HWND hwnd)
 	ListView_InsertColumn(hwndList, 0, &lvc);

 

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

-		item.pszText = TranslateW(pcli->pfnGetStatusModeDescription(i, 0));

+		item.pszText = TranslateW(Clist_GetStatusModeDescription(i, 0));

 		item.iItem = i - ID_STATUS_OFFLINE;

 		ListView_InsertItem(hwndList, &item);

 	}