From 73ff0a5f6b3fe6b26df14eb1dae413a26d002bbb Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 9 Apr 2011 02:21:57 +0300
Subject: Really remove nicks if need. Also remove colors if need.

---
 src/gui/chatwindow.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/gui')

diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp
index 1142636b4..47db83c75 100644
--- a/src/gui/chatwindow.cpp
+++ b/src/gui/chatwindow.cpp
@@ -940,12 +940,16 @@ void ChatWindow::whisper(const std::string &nick,
                     msg = msg.substr(idx + 1);
                     nick2 = removeColors(nick2);
                     nick2 = trim(nick2);
+                    if (config.getBoolValue("removeColors"))
+                        msg = removeColors(msg);
                     msg = trim(msg);
                     tab->chatLog(nick2, msg);
                 }
                 else
                 {
-                    tab->chatLog(nick, mes);
+                    if (config.getBoolValue("removeColors"))
+                        msg = removeColors(msg);
+                    tab->chatLog(msg, BY_SERVER);
                 }
             }
             else
-- 
cgit v1.2.3-60-g2f50