MS_CLIST_SETSTATUSMODE => Clist_SetStatusMode()

dunno how I could miss it

9 files changed, 11 insertions, 19 deletions

diff --git a/plugins/AutoShutdown/src/shutdownsvc.cpp b/plugins/AutoShutdown/src/shutdownsvc.cpp
index 547efe82fa..095c55d25b 100644
--- a/plugins/AutoShutdown/src/shutdownsvc.cpp
+++ b/plugins/AutoShutdown/src/shutdownsvc.cpp
@@ -155,7 +155,7 @@ static DWORD ShutdownNow(BYTE shutdownType)
 

 	case SDSDT_SETMIRANDAOFFLINE:

 		/* set global status mode to offline (is remembered by Miranda on exit) */

-		CallService(MS_CLIST_SETSTATUSMODE, (WPARAM)ID_STATUS_OFFLINE, 0);

+		Clist_SetStatusMode(ID_STATUS_OFFLINE);

 		break;

 

 	case SDSDT_STANDBY:

diff --git a/plugins/Clist_modern/src/modern_keyboard.cpp b/plugins/Clist_modern/src/modern_keyboard.cpp
index 5166ec57de..96e4c7a098 100644
--- a/plugins/Clist_modern/src/modern_keyboard.cpp
+++ b/plugins/Clist_modern/src/modern_keyboard.cpp
@@ -35,7 +35,7 @@ INT_PTR hkCloseMiranda(WPARAM, LPARAM)
 INT_PTR hkRestoreStatus(WPARAM, LPARAM)

 {

 	int nStatus = db_get_w(0, "CList", "Status", ID_STATUS_OFFLINE);

-	CallService(MS_CLIST_SETSTATUSMODE, nStatus, 0);

+	Clist_SetStatusMode(nStatus);

 

 	return 0;

 }

diff --git a/plugins/CmdLine/src/mimcmd_handlers.cpp b/plugins/CmdLine/src/mimcmd_handlers.cpp
index ca84413487..d50af580e2 100644
--- a/plugins/CmdLine/src/mimcmd_handlers.cpp
+++ b/plugins/CmdLine/src/mimcmd_handlers.cpp
@@ -247,7 +247,7 @@ void HandleStatusCommand(PCommand command, TArgument *argv, int argc, PReply rep
 				}

 

 				PrettyStatusMode(old, po, sizeof(po));

-				CallService(MS_CLIST_SETSTATUSMODE, status, 0);

+				Clist_SetStatusMode(status);

 				char pn[128];

 				PrettyStatusMode(status, pn, sizeof(pn));

 

diff --git a/plugins/MyDetails/src/data.cpp b/plugins/MyDetails/src/data.cpp
index 79a2cf47bd..7454b175b8 100644
--- a/plugins/MyDetails/src/data.cpp
+++ b/plugins/MyDetails/src/data.cpp
@@ -469,7 +469,7 @@ void ProtocolArray::SetNicks(const wchar_t *nick)
 

 void ProtocolArray::SetStatus(int aStatus)

 {

-	CallService(MS_CLIST_SETSTATUSMODE, aStatus, 0);

+	Clist_SetStatusMode(aStatus);

 }

 

 void ProtocolArray::SetStatusMsgs(const wchar_t *message)

diff --git a/plugins/NewAwaySysMod/src/Services.cpp b/plugins/NewAwaySysMod/src/Services.cpp
index 36ecd5a7ab..f2884ee947 100644
--- a/plugins/NewAwaySysMod/src/Services.cpp
+++ b/plugins/NewAwaySysMod/src/Services.cpp
@@ -41,7 +41,7 @@ __inline void PSSetStatus(char *szProto, WORD Status, int bNoClistSetStatusMode
 		CallProtoService(szProto, PS_SETSTATUS, Status, 0);

 	else if (!bNoClistSetStatusMode) { // global status

 		g_fNoProcessing = true;

-		CallService(MS_CLIST_SETSTATUSMODE, Status, 0);

+		Clist_SetStatusMode(Status);

 		_ASSERT(!g_fNoProcessing && g_ProtoStates[(char*)NULL].m_status == Status);

 		g_fNoProcessing = false;

 	}

@@ -64,7 +64,7 @@ INT_PTR SetStatusMode(WPARAM wParam, LPARAM lParam) // called by GamerStatus and
 {

 	LogMessage("MS_AWAYSYS_SETSTATUSMODE called. status=%d, szMsg:\n%s", wParam, lParam ? (char*)lParam : "NULL");

 	g_fNoProcessing = true;

-	CallService(MS_CLIST_SETSTATUSMODE, wParam, 0);

+	Clist_SetStatusMode(wParam);

 

 	_ASSERT(!g_fNoProcessing && g_ProtoStates[(char*)NULL].m_status == wParam);

 	g_fNoProcessing = false;

diff --git a/plugins/SimpleStatusMsg/src/main.cpp b/plugins/SimpleStatusMsg/src/main.cpp
index a6bcbb866f..7f64a3b6eb 100644
--- a/plugins/SimpleStatusMsg/src/main.cpp
+++ b/plugins/SimpleStatusMsg/src/main.cpp
@@ -811,7 +811,7 @@ void SetStatusMessage(const char *szProto, int iInitialStatus, int iStatus, wcha
 		{

 			// not so nice...

 			UnhookEvent(h_statusmodechange);

-			CallService(MS_CLIST_SETSTATUSMODE, (WPARAM)iStatus, 0);

+			Clist_SetStatusMode(iStatus);

 			h_statusmodechange = HookEvent(ME_CLIST_STATUSMODECHANGE, ChangeStatusMessage);

 		}

 	}

diff --git a/plugins/StatusManager/src/KeepStatus/keepstatus.cpp b/plugins/StatusManager/src/KeepStatus/keepstatus.cpp
index 01b63728a0..d518b47edc 100644
--- a/plugins/StatusManager/src/KeepStatus/keepstatus.cpp
+++ b/plugins/StatusManager/src/KeepStatus/keepstatus.cpp
@@ -1125,7 +1125,7 @@ static DWORD CALLBACK MessageWndProc(HWND, UINT msg, WPARAM wParam, LPARAM lPara
 					EnableProtocolService(0, (LPARAM)ps[i]->szName);
 
 				// set proto's offline, the clist will not try to reconnect in that case
-				CallService(MS_CLIST_SETSTATUSMODE, (WPARAM)ID_STATUS_OFFLINE, 0);
+				Clist_SetStatusMode(ID_STATUS_OFFLINE);
 			}
 			break;
 
diff --git a/plugins/StatusManager/src/StartupStatus/startupstatus.cpp b/plugins/StatusManager/src/StartupStatus/startupstatus.cpp
index 442c707f9d..f2614903f6 100644
--- a/plugins/StatusManager/src/StartupStatus/startupstatus.cpp
+++ b/plugins/StatusManager/src/StartupStatus/startupstatus.cpp
@@ -327,12 +327,8 @@ static int OnOkToExit(WPARAM, LPARAM)
 		}
 	}
 
-	if (db_get_b(NULL, SSMODULENAME, SETTING_SETPROFILE, 1) || db_get_b(NULL, SSMODULENAME, SETTING_OFFLINECLOSE, 0)) {
-		if (ServiceExists(MS_CLIST_SETSTATUSMODE))
-			CallService(MS_CLIST_SETSTATUSMODE, ID_STATUS_OFFLINE, 0);
-		else
-			log_debugA("StartupStatus: MS_CLIST_SETSTATUSMODE not available!");
-	}
+	if (db_get_b(NULL, SSMODULENAME, SETTING_SETPROFILE, 1) || db_get_b(NULL, SSMODULENAME, SETTING_OFFLINECLOSE, 0))
+		Clist_SetStatusMode(ID_STATUS_OFFLINE);
 
 	return 0;
 }
diff --git a/plugins/StatusManager/src/commonstatus.cpp b/plugins/StatusManager/src/commonstatus.cpp
index c016f4d3ba..bea099864e 100644
--- a/plugins/StatusManager/src/commonstatus.cpp
+++ b/plugins/StatusManager/src/commonstatus.cpp
@@ -246,12 +246,8 @@ INT_PTR SetStatusEx(WPARAM wParam, LPARAM)
 	}
 
 	if (globStatus != 0) {
-		if (!ServiceExists(MS_CLIST_SETSTATUSMODE)) {
-			log_debugA("CommonStatus: MS_CLIST_SETSTATUSMODE not available!");
-			return -1;
-		}
 		log_debugA("CommonStatus: setting global status %u", globStatus);
-		CallService(MS_CLIST_SETSTATUSMODE, globStatus, 0);
+		Clist_SetStatusMode(globStatus);
 	}
 
 	return 0;