diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-08-13 12:21:22 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-08-13 12:21:22 -0500 |
| commit | f65bcb8326e06816d7dc49e58bda120182dbbcd6 (patch) | |
| tree | 4e7fef001fc523929450778d10c86b41e6e32eda /opensuse/tdelibs/kremoteencoding-utf8.diff | |
| parent | 131df957b41b4683571b1e36e6fed9d614d32356 (diff) | |
| parent | fa41f32b69994ecd75b7359fa2df08ea5a3480ab (diff) | |
| download | tde-packaging-f65bcb8326e06816d7dc49e58bda120182dbbcd6.tar.gz tde-packaging-f65bcb8326e06816d7dc49e58bda120182dbbcd6.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'opensuse/tdelibs/kremoteencoding-utf8.diff')
| -rw-r--r-- | opensuse/tdelibs/kremoteencoding-utf8.diff | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/opensuse/tdelibs/kremoteencoding-utf8.diff b/opensuse/tdelibs/kremoteencoding-utf8.diff new file mode 100644 index 000000000..74600a0f4 --- /dev/null +++ b/opensuse/tdelibs/kremoteencoding-utf8.diff @@ -0,0 +1,28 @@ +Index: kio/kio/kremoteencoding.cpp +=================================================================== +--- kio/kio/kremoteencoding.cpp.orig ++++ kio/kio/kremoteencoding.cpp +@@ -53,7 +53,7 @@ QCString KRemoteEncoding::encode(const Q + QCString result = codec->fromUnicode(name); + if (codec->toUnicode(result) != name) + return name.latin1(); +- ++ + return result; + } + +@@ -80,11 +80,13 @@ void KRemoteEncoding::setEncoding(const + + if (name) + codec = QTextCodec::codecForName(name); ++ else ++ codec = QTextCodec::codecForMib( 106 ); // fallback to UTF-8 + + if (codec == 0L) + codec = QTextCodec::codecForMib(1); + +- kdDebug() << k_funcinfo << "setting encoding " << codec->name() ++ kdDebug() << k_funcinfo << "setting encoding " << codec->name() + << " for name=" << name << endl; + } + |