5 files changed, 7 insertions, 8 deletions
diff --git a/plugins/TabSRMM/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp
index b47f1f6214..5b4539fb8f 100644
--- a/plugins/TabSRMM/src/globals.cpp
+++ b/plugins/TabSRMM/src/globals.cpp
@@ -529,7 +529,7 @@ void CGlobals::RestoreUnreadMessageAlerts(void)
 
 	CLISTEVENT cle = {};
 	cle.hIcon = Skin_LoadIcon(SKINICON_EVENT_MESSAGE);
-	cle.pszService = "SRMsg/ReadMessage";
+	cle.pszService = MS_MSG_READMESSAGE;
 	cle.flags = CLEF_UNICODE;
 	cle.szTooltip.w = toolTip;
 
diff --git a/plugins/TabSRMM/src/hotkeyhandler.cpp b/plugins/TabSRMM/src/hotkeyhandler.cpp
index 10d092cb5e..5e613b9f6a 100644
--- a/plugins/TabSRMM/src/hotkeyhandler.cpp
+++ b/plugins/TabSRMM/src/hotkeyhandler.cpp
@@ -145,7 +145,7 @@ LONG_PTR CALLBACK HotkeyHandlerDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 		{
 			CLISTEVENT *cli = pcli->pfnGetEvent(-1, 0);
 			if (cli != nullptr) {
-				if (strncmp(cli->pszService, "SRMsg/TypingMessage", mir_strlen(cli->pszService))) {
+				if (strncmp(cli->pszService, MS_MSG_TYPINGMESSAGE, mir_strlen(cli->pszService))) {
 					CallService(cli->pszService, 0, (LPARAM)cli);
 					break;
 				}
diff --git a/plugins/TabSRMM/src/mim.cpp b/plugins/TabSRMM/src/mim.cpp
index 63e9975081..a275fa74be 100644
--- a/plugins/TabSRMM/src/mim.cpp
+++ b/plugins/TabSRMM/src/mim.cpp
@@ -283,7 +283,7 @@ int CMimAPI::TypingMessage(WPARAM hContact, LPARAM mode)
 			cle.hDbEvent = 1;
 			cle.flags = CLEF_ONLYAFEW | CLEF_UNICODE;
 			cle.hIcon = PluginConfig.g_buttonBarIcons[ICON_DEFAULT_TYPING];
-			cle.pszService = "SRMsg/TypingMessage";
+			cle.pszService = MS_MSG_TYPINGMESSAGE;
 			cle.szTooltip.w = szTip;
 			pcli->pfnAddEvent(&cle);
 		}
@@ -514,7 +514,7 @@ nowindowcreate:
 			cle.hDbEvent = hDbEvent;
 			cle.flags = CLEF_UNICODE;
 			cle.hIcon = Skin_LoadIcon(SKINICON_EVENT_MESSAGE);
-			cle.pszService = "SRMsg/ReadMessage";
+			cle.pszService = MS_MSG_READMESSAGE;
 			contactName = pcli->pfnGetContactDisplayName(hContact, 0);
 			mir_snwprintf(toolTip, TranslateT("Message from %s"), contactName);
 			cle.szTooltip.w = toolTip;
diff --git a/plugins/TabSRMM/src/msgdlgutils.cpp b/plugins/TabSRMM/src/msgdlgutils.cpp
index d28eaad284..f49abafe3c 100644
--- a/plugins/TabSRMM/src/msgdlgutils.cpp
+++ b/plugins/TabSRMM/src/msgdlgutils.cpp
@@ -777,7 +777,7 @@ void CTabBaseDlg::FlashOnClist(MEVENT hEvent, DBEVENTINFO *dbei)
 		cle.hContact = m_hContact;
 		cle.hDbEvent = hEvent;
 		cle.hIcon = Skin_LoadIcon(SKINICON_EVENT_MESSAGE);
-		cle.pszService = "SRMsg/ReadMessage";
+		cle.pszService = MS_MSG_READMESSAGE;
 		pcli->pfnAddEvent(&cle);
 
 		m_dwFlagsEx |= MWF_SHOW_FLASHCLIST;
diff --git a/plugins/TabSRMM/src/msgs.cpp b/plugins/TabSRMM/src/msgs.cpp
index 3a88bd7ee1..2e7473b05a 100644
--- a/plugins/TabSRMM/src/msgs.cpp
+++ b/plugins/TabSRMM/src/msgs.cpp
@@ -1004,15 +1004,14 @@ static INT_PTR ReloadSettings(WPARAM, LPARAM lParam)
 
 static void TSAPI InitAPI()
 {
+	CreateServiceFunction(MS_MSG_READMESSAGE, ReadMessageCommand);
 	CreateServiceFunction(MS_MSG_SENDMESSAGE, SendMessageCommand);
 	CreateServiceFunction(MS_MSG_SENDMESSAGEW, SendMessageCommand_W);
+	CreateServiceFunction(MS_MSG_TYPINGMESSAGE, TypingMessageCommand);
 
 	CreateServiceFunction("TabSRMsg/ReloadSkin", ReloadSkin);
 	CreateServiceFunction("TabSRMsg/ReloadSettings", ReloadSettings);
 
-	CreateServiceFunction("SRMsg/ReadMessage", ReadMessageCommand);
-	CreateServiceFunction("SRMsg/TypingMessage", TypingMessageCommand);
-	
 	CreateServiceFunction(MS_TABMSG_SETUSERPREFS, SetUserPrefs);
 	CreateServiceFunction(MS_TABMSG_TRAYSUPPORT, Service_OpenTrayMenu);
 	CreateServiceFunction(MS_TABMSG_SLQMGR, CSendLater::svcQMgr);