From 35cedcbe76747b34cdec00099f8067da662470b2 Mon Sep 17 00:00:00 2001
From: doitux <f.hammer@web.de>
Date: Sat, 24 Nov 2012 23:07:46 +0100
Subject: [PATCH 1/2] emoticons bugfix

---
 src/gui/qt/chattools/chattools.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/gui/qt/chattools/chattools.cpp b/src/gui/qt/chattools/chattools.cpp
index 39f78752..b4c060fd 100644
--- a/src/gui/qt/chattools/chattools.cpp
+++ b/src/gui/qt/chattools/chattools.cpp
@@ -316,12 +316,14 @@ unsigned ChatTools::parsePrivateMessageTarget(QString &chatText)
 
 QString ChatTools::checkForEmotes(QString msg) {
 
+    qDebug() << msg;
+
     msg.replace("0:-)", "<img src=\":emotes/emotes/face-angel.png\" />");
     msg.replace("X-(", "<img src=\":emotes/emotes/face-angry.png\" />");
     msg.replace("B-)", "<img src=\":emotes/emotes/face-cool.png\" />");
     msg.replace("8-)", "<img src=\":emotes/emotes/face-cool.png\" />");
     msg.replace(":'(", "<img src=\":emotes/emotes/face-crying.png\" />");
-    msg.replace(">:-)", "<img src=\":emotes/emotes/face-devilish.png\" />");
+    msg.replace("&gt;:-)", "<img src=\":emotes/emotes/face-devilish.png\" />");
     msg.replace(":-[", "<img src=\":emotes/emotes/face-embarrassed.png\" />");
     msg.replace(":-*", "<img src=\":emotes/emotes/face-kiss.png\" />");
     msg.replace(":-))", "<img src=\":emotes/emotes/face-laugh.png\" />");

From e29b0de6f22d45b81ce1b69fbea3898216072a4f Mon Sep 17 00:00:00 2001
From: doitux <f.hammer@web.de>
Date: Sat, 24 Nov 2012 23:08:11 +0100
Subject: [PATCH 2/2] remove debug msg

---
 src/gui/qt/chattools/chattools.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/gui/qt/chattools/chattools.cpp b/src/gui/qt/chattools/chattools.cpp
index b4c060fd..87d62162 100644
--- a/src/gui/qt/chattools/chattools.cpp
+++ b/src/gui/qt/chattools/chattools.cpp
@@ -316,8 +316,6 @@ unsigned ChatTools::parsePrivateMessageTarget(QString &chatText)
 
 QString ChatTools::checkForEmotes(QString msg) {
 
-    qDebug() << msg;
-
     msg.replace("0:-)", "<img src=\":emotes/emotes/face-angel.png\" />");
     msg.replace("X-(", "<img src=\":emotes/emotes/face-angry.png\" />");
     msg.replace("B-)", "<img src=\":emotes/emotes/face-cool.png\" />");