From a0973b8460f258b634d4236313f9dbd488bf38bb Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Fri, 12 Aug 2022 13:29:28 +0300
Subject: fixes #3157 (Jabber: do not add : when user issue a /me command)

---
 plugins/NewStory/src/history_array.cpp |  5 +----
 plugins/TabSRMM/src/chat_log.cpp       |  6 ++----
 plugins/TabSRMM/src/msgs.cpp           |  2 +-
 src/mir_app/src/chat_log.cpp           |  6 ++----
 src/mir_app/src/chat_tools.cpp         | 10 ++--------
 5 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/plugins/NewStory/src/history_array.cpp b/plugins/NewStory/src/history_array.cpp
index 6ce9ed2116..87571efe9c 100644
--- a/plugins/NewStory/src/history_array.cpp
+++ b/plugins/NewStory/src/history_array.cpp
@@ -218,11 +218,8 @@ void HistoryArray::addChatEvent(SESSION_INFO *si, LOGINFO *lin)
 
 	CMStringW wszText;
 	bool bTextUsed = Chat_GetDefaultEventDescr(si, lin, wszText);
-	if (!bTextUsed && lin->ptszText) {
-		if (!wszText.IsEmpty())
-			wszText.Append(L": ");
+	if (!bTextUsed && lin->ptszText)
 		wszText.Append(g_chatApi.RemoveFormatting(lin->ptszText));
-	}
 
 	auto &p = allocateItem();
 	p.hContact = si->hContact;
diff --git a/plugins/TabSRMM/src/chat_log.cpp b/plugins/TabSRMM/src/chat_log.cpp
index ad6690c4d8..89559fd94d 100644
--- a/plugins/TabSRMM/src/chat_log.cpp
+++ b/plugins/TabSRMM/src/chat_log.cpp
@@ -229,11 +229,9 @@ static void AddEventToBuffer(CMStringA &str, LOGSTREAMDATA *streamData)
 	bool bTextUsed = Chat_GetDefaultEventDescr(streamData->si, streamData->lin, wszCaption);
 	if (!wszCaption.IsEmpty())
 		Log_AppendRTF(streamData, !bTextUsed, str, wszCaption);
-	if (!bTextUsed && streamData->lin->ptszText) {
-		if (!wszCaption.IsEmpty())
-			Log_AppendRTF(streamData, false, str, L": ");
+
+	if (!bTextUsed && streamData->lin->ptszText)
 		Log_AppendRTF(streamData, false, str, streamData->lin->ptszText);
-	}
 }
 
 char* Log_CreateRtfHeader(void)
diff --git a/plugins/TabSRMM/src/msgs.cpp b/plugins/TabSRMM/src/msgs.cpp
index c720434072..010daf2a9d 100644
--- a/plugins/TabSRMM/src/msgs.cpp
+++ b/plugins/TabSRMM/src/msgs.cpp
@@ -29,7 +29,7 @@
 
 #include "stdafx.h"
 
-#define IDI_CORE_LOAD	132					// icon id for the "connecting" icon
+#define IDI_CORE_LOAD 132 // icon id for the "connecting" icon
 
 static HANDLE hUserPrefsWindowLis = nullptr;
 HMODULE g_hMsftedit;
diff --git a/src/mir_app/src/chat_log.cpp b/src/mir_app/src/chat_log.cpp
index c34c7de691..b4a140c570 100644
--- a/src/mir_app/src/chat_log.cpp
+++ b/src/mir_app/src/chat_log.cpp
@@ -258,11 +258,9 @@ static void AddEventToBuffer(CMStringA &buf, LOGSTREAMDATA *streamData)
 	bool bTextUsed = Chat_GetDefaultEventDescr(streamData->si, streamData->lin, wszCaption);
 	if (!wszCaption.IsEmpty())
 		Log_AppendRTF(streamData, !bTextUsed, buf, wszCaption);
-	if (!bTextUsed && streamData->lin->ptszText) {
-		if (!wszCaption.IsEmpty())
-			Log_AppendRTF(streamData, false, buf, L": ");
+
+	if (!bTextUsed && streamData->lin->ptszText)
 		Log_AppendRTF(streamData, false, buf, streamData->lin->ptszText);
-	}
 }
 
 wchar_t* MakeTimeStamp(wchar_t *pszStamp, time_t time)
diff --git a/src/mir_app/src/chat_tools.cpp b/src/mir_app/src/chat_tools.cpp
index b3a45440b8..c8da42c41d 100644
--- a/src/mir_app/src/chat_tools.cpp
+++ b/src/mir_app/src/chat_tools.cpp
@@ -348,11 +348,8 @@ BOOL DoPopup(SESSION_INFO *si, GCEVENT *gce)
 		break;
 	}
 
-	if (!bTextUsed && lin.ptszText) {
-		if (!wszText.IsEmpty())
-			wszText.Append(L": ");
+	if (!bTextUsed && lin.ptszText)
 		wszText.Append(RemoveFormatting(gce->pszText.w));
-	}
 
 	g_chatApi.ShowPopup(si->hContact, si, g_chatApi.getIcon(gce->iType), si->pszModule, si->ptszName, dwColor, L"%s", wszText.c_str());
 	return TRUE;
@@ -548,11 +545,8 @@ BOOL LogToFile(SESSION_INFO *si, GCEVENT *gce)
 		break;
 	}
 
-	if (!bTextUsed && lin.ptszText) {
-		if (!buf.IsEmpty())
-			buf.Append(L": ");
+	if (!bTextUsed && lin.ptszText)
 		buf.Append(RemoveFormatting(gce->pszText.w));
-	}
 
 	// formatting strings don't need to be translatable - changing them via language pack would
 	// only screw up the log format.
-- 
cgit v1.2.3