diff -Nur kdepim-3.4.0/knode/knconfig.cpp kdepim-3.4.0.new/knode/knconfig.cpp --- kdepim-3.4.0/knode/knconfig.cpp 2005-02-03 19:12:08.000000000 -0400 +++ kdepim-3.4.0.new/knode/knconfig.cpp 2005-04-17 11:03:39.000000000 -0300 @@ -937,7 +937,7 @@ c_omposerCharsets=QStringList::split(',',"us-ascii,utf-8,iso-8859-1,iso-8859-2," "iso-8859-3,iso-8859-4,iso-8859-5,iso-8859-6,iso-8859-7,iso-8859-8," "iso-8859-9,iso-8859-10,iso-8859-13,iso-8859-14,iso-8859-15,koi8-r,koi8-u," - "iso-2022-jp,iso-2022-jp-2,iso-2022-kr,euc-jp,euc-kr,Big5,gb2312"); + "iso-2022-jp,iso-2022-jp-2,iso-2022-kr,euc-jp,euc-kr,Big5,gb2312,gbk,gb18030"); c_harset=conf->readEntry("Charset").latin1(); if (c_harset.isEmpty()) { diff -Nur kdepim-3.4.0/knode/kngroup.cpp kdepim-3.4.0.new/knode/kngroup.cpp --- kdepim-3.4.0/knode/kngroup.cpp 2005-01-03 10:54:19.000000000 -0400 +++ kdepim-3.4.0.new/knode/kngroup.cpp 2005-04-17 11:03:40.000000000 -0300 @@ -40,7 +40,7 @@ KNGroup::KNGroup(KNCollection *p) : KNArticleCollection(p), n_ewCount(0), l_astFetchCount(0), r_eadCount(0), i_gnoreCount(0), l_astNr(0), m_axFetch(0), d_ynDataFormat(1), f_irstNew(-1), l_ocked(false), - u_seCharset(false), s_tatus(unknown), i_dentity(0) + u_seCharset(true), s_tatus(unknown), i_dentity(0) { mCleanupConf = new KNConfig::Cleanup( false ); } @@ -90,7 +90,7 @@ f_irstNr = info.readNumEntry("firstMsg",0); l_astNr = info.readNumEntry("lastMsg",0); d_ynDataFormat = info.readNumEntry("dynDataFormat",0); - u_seCharset = info.readBoolEntry("useCharset", false); + u_seCharset = info.readBoolEntry("useCharset", true); d_efaultChSet = info.readEntry("defaultChSet").latin1(); QString s = info.readEntry("status","unknown"); if (s=="readOnly") diff -Nur kdepim-3.4.0/knode/kngroupmanager.cpp kdepim-3.4.0.new/knode/kngroupmanager.cpp --- kdepim-3.4.0/knode/kngroupmanager.cpp 2005-01-03 10:54:19.000000000 -0400 +++ kdepim-3.4.0.new/knode/kngroupmanager.cpp 2005-04-17 11:03:40.000000000 -0300 @@ -114,18 +114,18 @@ sepPos1 = line.find(' '); if (sepPos1==-1) { // no description - name = QString::fromUtf8(line); + name = QString::fromLocal8Bit(line); description = QString::null; status = KNGroup::unknown; } else { - name = QString::fromUtf8(line.left(sepPos1)); + name = QString::fromLocal8Bit(line.left(sepPos1)); sepPos2 = line.find(' ',sepPos1+1); if (sepPos2==-1) { // no status - description = QString::fromUtf8(line.right(line.length()-sepPos1-1)); + description = QString::fromLocal8Bit(line.right(line.length()-sepPos1-1)); status = KNGroup::unknown; } else { - description = QString::fromUtf8(line.right(line.length()-sepPos2-1)); + description = QString::fromLocal8Bit(line.right(line.length()-sepPos2-1)); switch (line[sepPos1+1]) { case 'u': status = KNGroup::unknown; break; @@ -170,7 +170,7 @@ if(f.open(IO_WriteOnly)) { for (KNGroupInfo *i=groups->first(); i; i=groups->next()) { - temp = i->name.utf8(); + temp = i->name.local8Bit(); switch (i->status) { case KNGroup::unknown: temp += " u "; break; diff -Nur kdepim-3.4.0/knode/knnntpclient.cpp kdepim-3.4.0.new/knode/knnntpclient.cpp --- kdepim-3.4.0/knode/knnntpclient.cpp 2004-08-24 07:55:09.000000000 -0300 +++ kdepim-3.4.0.new/knode/knnntpclient.cpp 2005-04-17 11:03:40.000000000 -0300 @@ -113,7 +113,7 @@ } else { s[0] = 0; // cut string - name = QString::fromUtf8(line); + name = QString::fromLocal8Bit(line); if (target->subscribed.contains(name)) { target->subscribed.remove(name); // group names are unique, we wont find it again anyway... @@ -182,7 +182,7 @@ s++; while (*s == ' ' || *s == '\t') s++; // go on to the description - name = QString::fromUtf8(line); + name = QString::fromLocal8Bit(line); if (target->codecForDescriptions) // some countries use local 8 bit characters in the tag line description = target->codecForDescriptions->toUnicode(s); else @@ -248,7 +248,7 @@ #endif } else { s[0] = 0; // cut string - name = QString::fromUtf8(line); + name = QString::fromLocal8Bit(line); while (s[1]!=0) s++; // the last character determines the moderation status switch (s[0]) { @@ -284,7 +284,7 @@ int rep; for (KNGroupInfo *group=tmpList.first(); group; group=tmpList.next()) { - if (!sendCommand(cmd+group->name.utf8(),rep)) + if (!sendCommand(cmd+group->name.local8Bit(),rep)) return; if (rep != 215) // 215 informations follows break; @@ -339,7 +339,7 @@ .arg(account.server()).arg(target->groupname()); cmd="GROUP "; - cmd+=target->groupname().utf8(); + cmd+=target->groupname().local8Bit(); if (!sendCommandWCheck(cmd,211)) { // 211 n f l s group selected return; } @@ -458,7 +458,7 @@ QString groupName = static_cast(target->collection())->groupname(); if (currentGroup != groupName) { cmd="GROUP "; - cmd+=groupName.utf8(); + cmd+=groupName.local8Bit(); if (!sendCommandWCheck(cmd,211)) // 211 n f l s group selected return; currentGroup = groupName; diff -Nur kdepim-3.4.0/libkmime/kmime_headers.cpp kdepim-3.4.0.new/libkmime/kmime_headers.cpp --- kdepim-3.4.0/libkmime/kmime_headers.cpp 2003-07-26 11:51:52.000000000 -0300 +++ kdepim-3.4.0.new/libkmime/kmime_headers.cpp 2005-04-17 11:06:29.000000000 -0300 @@ -946,14 +946,14 @@ void Newsgroups::fromUnicodeString(const QString &s, const QCString&) { - g_roups=s.utf8(); + g_roups=s.local8Bit(); e_ncCS=cachedCharset("UTF-8"); } QString Newsgroups::asUnicodeString() { - return QString::fromUtf8(g_roups); + return QString::fromLocal8Bit(g_roups); }