Merged 0.0 changes from revision 3362 to 3580 to trunk.

1 files changed, 7 insertions, 3 deletions

diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index ba7c7f02..4ed8bb97 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -44,6 +44,7 @@
 #include "../net/gameserver/player.h"
 
 #include "../utils/dtor.h"
+#include "../utils/trim.h"
 
 ChatWindow::ChatWindow():
     Window(),
@@ -125,7 +126,7 @@ void
 ChatWindow::chatLog(std::string line, int own, std::string channelName)
 {
     // Delete overhead from the end of the list
-    while ((int)mChatlog.size() > mItemsKeep) {
+    while ((int) mChatlog.size() > mItemsKeep) {
         mChatlog.pop_back();
     }
 
@@ -142,12 +143,15 @@ ChatWindow::chatLog(std::string line, int own, std::string channelName)
         own = BY_SERVER;
     }
 
-    int pos = line.find(" : ");
-    if (pos > 0) {
+    std::string::size_type pos = line.find(" : ");
+    if (pos != std::string::npos) {
         tmp.nick = line.substr(0, pos);
         line.erase(0, pos + 3);
     }
 
+    // Trim whitespace
+    trim(line);
+
     std::string lineColor = "##0"; // Equiv. to BrowserBox::BLACK
     switch (own) {
         case BY_GM: