diff options
| author | George Hazan <ghazan@miranda.im> | 2022-08-12 13:29:28 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2022-08-12 13:29:28 +0300 |
| commit | a0973b8460f258b634d4236313f9dbd488bf38bb (patch) | |
| tree | aedc06e82757778f7b1d08286409d7b0bcb0e568 /plugins | |
| parent | 93cc6c29218ee9877e4fcb2c31fe0c653a62b3f7 (diff) | |
fixes #3157 (Jabber: do not add : when user issue a /me command)
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/NewStory/src/history_array.cpp | 5 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/chat_log.cpp | 6 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/msgs.cpp | 2 |
3 files changed, 4 insertions, 9 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;
|