X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Futil.cpp;h=45f99e9b5894c83f8cd8d38893d18e8a297de8d6;hp=75f32f2ec60f528ca8b89b114b7b1a63da2bc7d3;hb=e0781eeb34db0aaa775bd3439c1c98103437f009;hpb=9fc57dc2c000e80fb8bd746a090e2e8210e1278e

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.