From d6ebd42f473aae9ab99b6764c984823be374f8d4 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Tue, 23 Jul 2019 22:40:32 +0300
Subject: code cleaning

---
 src/mir_app/src/auth.cpp         | 8 ++++----
 src/mir_app/src/chat_log.cpp     | 2 +-
 src/mir_app/src/chat_manager.cpp | 5 ++---
 3 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'src/mir_app')

diff --git a/src/mir_app/src/auth.cpp b/src/mir_app/src/auth.cpp
index cc7716708a..9818034105 100644
--- a/src/mir_app/src/auth.cpp
+++ b/src/mir_app/src/auth.cpp
@@ -231,14 +231,14 @@ public:
 		wchar_t name[128] = L"";
 		int off = 0;
 		if (firstT[0] && lastT[0])
-			off = mir_snwprintf(name, L"%s %s", firstT, lastT);
+			off = mir_snwprintf(name, L"%s %s", firstT.get(), lastT.get());
 		else if (firstT[0])
-			off = mir_snwprintf(name, L"%s", firstT);
+			off = mir_snwprintf(name, L"%s", firstT.get());
 		else if (lastT[0])
-			off = mir_snwprintf(name, L"%s", lastT);
+			off = mir_snwprintf(name, L"%s", lastT.get());
 		if (nickT[0]) {
 			if (off)
-				mir_snwprintf(name + off, _countof(name) - off, L" (%s)", nickT);
+				mir_snwprintf(name + off, _countof(name) - off, L" (%s)", nickT.get());
 			else
 				wcsncpy_s(name, nickT, _TRUNCATE);
 		}
diff --git a/src/mir_app/src/chat_log.cpp b/src/mir_app/src/chat_log.cpp
index bfe6433e12..5308ea58fa 100644
--- a/src/mir_app/src/chat_log.cpp
+++ b/src/mir_app/src/chat_log.cpp
@@ -318,7 +318,7 @@ char* Log_CreateRTF(LOGSTREAMDATA *streamData)
 
 		// Insert icon
 		if ((lin->iType & g_Settings->dwIconFlags) || lin->bIsHighlighted && (g_Settings->dwIconFlags & GC_EVENT_HIGHLIGHT)) {
-			int iIndex = (lin->bIsHighlighted && g_Settings->dwIconFlags & GC_EVENT_HIGHLIGHT) ? ICON_HIGHLIGHT : EventToIcon(lin);
+			int iIndex = (lin->bIsHighlighted && (g_Settings->dwIconFlags & GC_EVENT_HIGHLIGHT)) ? ICON_HIGHLIGHT : EventToIcon(lin);
 			buf.Append("\\f0\\fs14");
 			buf.Append(pLogIconBmpBits[iIndex]);
 		}
diff --git a/src/mir_app/src/chat_manager.cpp b/src/mir_app/src/chat_manager.cpp
index 9b8fcd4ced..991fa6dbb2 100644
--- a/src/mir_app/src/chat_manager.cpp
+++ b/src/mir_app/src/chat_manager.cpp
@@ -796,8 +796,7 @@ BOOL UM_SetStatusEx(SESSION_INFO *si, const wchar_t* pszText, int flags)
 	}
 
 	for (auto &ui : si->getUserList()) {
-		if (!bOnlyMe)
-			ui->iStatusEx = 0;
+		ui->iStatusEx = 0;
 
 		if (pszText != nullptr) {
 			wchar_t *s = (wchar_t *)wcsstr(pszText, ui->pszUID);
@@ -806,7 +805,7 @@ BOOL UM_SetStatusEx(SESSION_INFO *si, const wchar_t* pszText, int flags)
 				if (s == pszText || s[-1] == cDelimiter) {
 					size_t len = mir_wstrlen(ui->pszUID);
 					if (s[len] == cDelimiter || s[len] == '\0')
-						ui->iStatusEx = (!bOnlyMe || bSetStatus) ? 1 : 0;
+						ui->iStatusEx = bSetStatus ? 1 : 0;
 				}
 			}
 		}
-- 
cgit v1.2.3