From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Tue, 19 Feb 2013 22:34:28 +0000 (-0800)
Subject: Merge pull request #7 from Tucos/bug-640
X-Git-Tag: 0.9-beta1~15
X-Git-Url: https://git.quassel-irc.org/?a=commitdiff_plain;h=4c80eeb2d07b5ca75fd399b51c939961fdff1670;hp=bae8c28f27159ec803daff083da125b313c128d1;p=quassel.git

Merge pull request #7 from Tucos/bug-640

Add codec blacklist for UTF-8 detection
---

diff --git a/src/common/util.cpp b/src/common/util.cpp
index 75f32f2e..45f99e9b 100644
--- a/src/common/util.cpp
+++ b/src/common/util.cpp
@@ -29,6 +29,10 @@
 
 class QMetaMethod;
 
+// MIBenum values from http://www.iana.org/assignments/character-sets/character-sets.xml#table-character-sets-1
+static QList<int> utf8DetectionBlacklist = QList<int>()
+    << 39 /* ISO-2022-JP */;
+
 QString nickFromMask(QString mask)
 {
     return mask.section('!', 0, 0);
@@ -90,6 +94,9 @@ QString stripAcceleratorMarkers(const QString &label_)
 
 QString decodeString(const QByteArray &input, QTextCodec *codec)
 {
+    if (codec && utf8DetectionBlacklist.contains(codec->mibEnum()))
+        return codec->toUnicode(input);
+
     // First, we check if it's utf8. It is very improbable to encounter a string that looks like
     // valid utf8, but in fact is not. This means that if the input string passes as valid utf8, it
     // is safe to assume that it is.