diff -uNr kdelibs.org/kdecore/kcharsets.cpp kdelibs/kdecore/kcharsets.cpp --- kdelibs.org/kdecore/kcharsets.cpp Thu May 17 04:50:51 2001 +++ kdelibs/kdecore/kcharsets.cpp Thu May 17 04:53:54 2001 @@ -493,7 +493,7 @@ if(chFamilies.count() != 0) { //kdDebug() << "KCharsets::setQFont: using family " << chFamilies.first() << " in native charset " << charset << endl; - f.setFamily(chFamilies.first()); + //f.setFamily(chFamilies.first()); by bumchul f.setCharSet(charset); return; } diff -uNr kdelibs.org/kdecore/kglobalsettings.cpp kdelibs/kdecore/kglobalsettings.cpp --- kdelibs.org/kdecore/kglobalsettings.cpp Thu May 17 04:50:53 2001 +++ kdelibs/kdecore/kglobalsettings.cpp Thu May 17 04:55:10 2001 @@ -246,8 +246,9 @@ if (_generalFont) return *_generalFont; - _generalFont = new QFont("helvetica", 12, QFont::SansSerif); - _generalFont->setPixelSize(12); + //_generalFont = new QFont("helvetica", 12, QFont::SansSerif); + //_generalFont->setPixelSize(12); + _generalFont = new QFont("helvetica", 12, QFont::Normal); KConfig *c = KGlobal::config(); KConfigGroupSaver cgs( c, QString::fromLatin1("General") ); @@ -263,8 +264,9 @@ if (_fixedFont) return *_fixedFont; - _fixedFont = new QFont("courier", 12, QFont::TypeWriter); - _fixedFont->setPixelSize(12); + //_fixedFont = new QFont("courier", 12, QFont::TypeWriter); + //_fixedFont->setPixelSize(12); + _fixedFont = new QFont("courier", 12, QFont::Normal); KConfig *c = KGlobal::config(); KConfigGroupSaver cgs( c, QString::fromLatin1("General") ); @@ -282,8 +284,9 @@ if(_toolBarFont) return *_toolBarFont; - _toolBarFont = new QFont("helvetica", 10, QFont::SansSerif); - _toolBarFont->setPixelSize(10); + //_toolBarFont = new QFont("helvetica", 10, QFont::SansSerif); + //_toolBarFont->setPixelSize(10); + _toolBarFont = new QFont("helvetica", 10, QFont::Normal); KConfig *c = KGlobal::config(); KConfigGroupSaver cgs( c, QString::fromLatin1("General") ); @@ -299,8 +302,9 @@ if(_menuFont) return *_menuFont; - _menuFont = new QFont("helvetica", 12, QFont::SansSerif); - _menuFont->setPixelSize(12); + //_menuFont = new QFont("helvetica", 12, QFont::SansSerif); + //_menuFont->setPixelSize(12); + _menuFont = new QFont("helvetica", 12, QFont::Normal); KConfig *c = KGlobal::config(); KConfigGroupSaver cgs( c, QString::fromLatin1("General") ); diff -uNr kdelibs.org/kdecore/klocale.cpp kdelibs/kdecore/klocale.cpp --- kdelibs.org/kdecore/klocale.cpp Thu May 17 04:50:51 2001 +++ kdelibs/kdecore/klocale.cpp Thu May 17 04:57:24 2001 @@ -187,14 +187,24 @@ if (chset.isEmpty()) { - chset = QString::fromLatin1("iso-8859-1"); - qt_set_locale_codec(QTextCodec::codecForMib(4)); // latin-1 + //chset = QString::fromLatin1("iso-8859-1"); + //qt_set_locale_codec(QTextCodec::codecForMib(4)); // latin-1 // ### we should default to Qt's default, as thats always more intelligent + // by bumchul + bool ok; + chset = QTextCodec::codecForLocale()->name(); + QTextCodec* nc = KGlobal::charsets()->codecForName(chset, ok); + if(!ok) + qWarning("** Warning: charset %s is not known. using ISO 8859-1 instead.", chset.latin1()); + qt_set_locale_codec(nc); } else { bool ok; - QTextCodec* nc = KGlobal::charsets()->codecForName(chset, ok); + //QTextCodec* nc = KGlobal::charsets()->codecForName(chset, ok); + // by bumchul + QTextCodec* nc = KGlobal::charsets()->codecForName( + KGlobal::charsets()->name(KGlobal::charsets()->xNameToID(chset)) ,ok); // if !ok, we have a problem. it will return latin-1 then, but thats // obviously not what the user wants if(!ok) @@ -235,6 +245,8 @@ { char buf[256]; f.readLine(buf, 256); + // by bumchul + char *p; if(p=index(buf,'\n')) *p=0; _codec = KGlobal::charsets()->codecForName( buf ); f.close(); } diff -uNr kdelibs.org/kdecore/kwin.cpp kdelibs/kdecore/kwin.cpp --- kdelibs.org/kdecore/kwin.cpp Thu May 17 04:50:53 2001 +++ kdelibs/kdecore/kwin.cpp Thu May 17 04:58:13 2001 @@ -214,11 +214,29 @@ if ( inf.name() ) { w.name = QString::fromUtf8( inf.name() ); } else { - char* c = 0; - if ( XFetchName( qt_xdisplay(), win, &c ) != 0 ) { - w.name = QString::fromLocal8Bit( c ); - XFree( c ); - } + /* char* c = 0; + * if ( XFetchName( qt_xdisplay(), win, &c ) != 0 ) { + * w.name = QString::fromLocal8Bit( c ); + * XFree( c ); + * } + */ + XTextProperty tp; + char **text; + int count; + + XGetTextProperty (qt_xdisplay(), win, &tp, XA_WM_NAME); + if (tp.encoding == XA_STRING) { + w.name = QString::fromLocal8Bit( (const char*) tp.value ); + } + else { + if (XmbTextPropertyToTextList (qt_xdisplay(), &tp, &text, &count) == Success && text != NULL) { + if (count > 0) { + w.name = QString::fromLocal8Bit( (const char*) text[0] ); + } + XFreeStringList (text); + } + } + XFree (tp.value); } if ( inf.visibleName() ) w.visibleName = QString::fromUtf8( inf.visibleName() ); diff -uNr kdelibs.org/khtml/css/cssstyleselector.cpp kdelibs/khtml/css/cssstyleselector.cpp --- kdelibs.org/khtml/css/cssstyleselector.cpp Thu May 17 04:51:07 2001 +++ kdelibs/khtml/css/cssstyleselector.cpp Thu May 17 05:00:26 2001 @@ -1839,7 +1839,8 @@ case CSS_VAL_X_LARGE: size = standardSizes[5]; break; case CSS_VAL_XX_LARGE: - size = standardSizes[6]; break; + //size = standardSizes[6]; break; + size = standardSizes[5]; break; case CSS_VAL_LARGER: // ### use the next bigger standardSize!!! size = oldSize * 1.2; diff -uNr kdelibs.org/khtml/html/htmltokenizer.cpp kdelibs/khtml/html/htmltokenizer.cpp --- kdelibs.org/khtml/html/htmltokenizer.cpp Thu May 17 04:51:10 2001 +++ kdelibs/khtml/html/htmltokenizer.cpp Thu May 17 05:01:28 2001 @@ -87,6 +87,7 @@ case 0x96: (x) = '-'; break; \ case 0x97: (x) = '-'; break; \ case 0x98: (x) = '~'; break; \ + case 0xa0: (x) = ' '; break; \ case 0xb7: (x) = '*'; break; \ case 0x2019: (x) = '\''; break; \ default: break; \ diff -uNr kdelibs.org/kio/ftp/ftp.cc kdelibs/kio/ftp/ftp.cc --- kdelibs.org/kio/ftp/ftp.cc Thu May 17 04:51:18 2001 +++ kdelibs/kio/ftp/ftp.cc Thu May 17 05:08:40 2001 @@ -911,7 +911,9 @@ if ( !_path.isEmpty() ) { tmp += " "; - tmp += _path.ascii(); + //tmp += _path.ascii(); + // by bumchul + tmp += _path.local8Bit().data(); } if ( !ftpSendCmd( tmp, '1' ) ) { @@ -985,7 +987,9 @@ assert( m_bLoggedOn ); QCString buf = "mkd "; - buf += path.latin1(); + //buf += path.latin1(); + // by bumchul + buf += path.local8Bit().data(); if ( ! ftpSendCmd( buf, '2' ) ) { @@ -1028,11 +1032,18 @@ QCString cmd; cmd = "RNFR "; - cmd += src.ascii(); + //cmd += src.ascii(); + // by bumchul + cmd += src.local8Bit().data(); + if ( !ftpSendCmd( cmd, '3') ) return false; + cmd = "RNTO "; - cmd += dst.ascii(); + //cmd += dst.ascii(); + // by bumchul + cmd += dst.local8Bit().data(); + return ftpSendCmd( cmd, '2' ); } @@ -1056,14 +1067,19 @@ // When deleting a directory, we must exit from it first // The last command probably went into it (to stat it) QCString tmp = "cwd "; - tmp += url.directory().ascii(); + //tmp += url.directory().ascii(); + // by bumchul + tmp += url.directory().local8Bit().data(); (void) ftpSendCmd( tmp, '2' ); // ignore errors } QCString cmd = isfile ? "DELE " : "RMD "; - cmd += path.ascii(); + //cmd += path.ascii(); + // by bumchul + cmd += path.local8Bit().data(); + if ( !ftpSendCmd( cmd, '2' ) ) error( ERR_CANNOT_DELETE, path ); @@ -1083,7 +1099,10 @@ sprintf(buf, "%o ", permissions & 511 ); cmd += buf; - cmd += path.ascii(); + //cmd += path.ascii(); + // by bumchul + cmd += path.local8Bit().data(); + return ftpSendCmd( cmd, '2' ); } @@ -1229,7 +1248,10 @@ // Try cwd into it, if it works it's a dir (and then we'll list the parent directory to get more info) // if it doesn't work, it's a file (and then we'll use dir filename) QCString tmp = "cwd "; - tmp += path.latin1(); + //tmp += path.latin1(); + // by bumchul + tmp += path.local8Bit().data(); + if ( !ftpSendCmd( tmp, '\0' /* no builtin response check */ ) ) { kdDebug(7102) << "stat: ftpSendCmd returned false" << endl; @@ -1287,7 +1309,10 @@ // Now cwd the parent dir, to prepare for listing tmp = "cwd "; - tmp += parentDir.latin1(); + //tmp += parentDir.latin1(); + // JungHo Park + tmp += parentDir.local8Bit().data(); + if ( !ftpSendCmd( tmp, '2' ) ) { kdDebug(7102) << "stat: Could not go to parent directory" << endl; @@ -1497,7 +1522,9 @@ // We try to change to this directory first to see whether it really is a directory. // (And also to follow symlinks) QCString tmp = "cwd "; - tmp += ( !path.isEmpty() ) ? path.latin1() : "/"; + //tmp += ( !path.isEmpty() ) ? path.latin1() : "/"; + // by bumchul + tmp += ( !path.isEmpty() ) ? path.local8Bit().data() : "/"; if ( !ftpSendCmd( tmp, '2' ) ) { @@ -1645,10 +1672,14 @@ de.owner = QString::fromLatin1(p_owner); de.group = QString::fromLatin1(p_group); de.size = atoi(p_size); - QCString tmp( p_name ); + //QCString tmp( p_name ); + QCString tmp( p_name, strlen(p_name)+1 ); + // Some sites put more than one space between the date and the name // e.g. ftp://ftp.uni-marburg.de/mirror/ - de.name = QString::fromLatin1(tmp.stripWhiteSpace()); + //de.name = QString::fromLatin1(tmp.stripWhiteSpace()); + // bumchul + de.name = QString::fromLocal8Bit(tmp.stripWhiteSpace()); // Parsing the date is somewhat tricky // Examples : "Oct 6 22:49", "May 13 1999" @@ -1940,7 +1971,10 @@ { if ( m_size == 0 ) { // delete files with zero size QCString cmd = "DELE "; - cmd += dest_orig.ascii(); + //cmd += dest_orig.ascii(); + // by bumchul + cmd += dest_orig.local8Bit().data(); + if ( !ftpSendCmd( cmd, '2' ) ) { error( ERR_CANNOT_DELETE_PARTIAL, dest_orig ); @@ -1961,7 +1995,10 @@ } else if ( ftpSize( dest_part, 'I' ) ) { // file with extension .part exists if ( m_size == 0 ) { // delete files with zero size QCString cmd = "DELE "; - cmd += dest_part.ascii(); + //cmd += dest_part.ascii(); + // by bumchul + cmd += dest_part.local8Bit().data(); + if ( !ftpSendCmd( cmd, '2' ) ) { error( ERR_CANNOT_DELETE_PARTIAL, dest_orig ); @@ -2025,7 +2062,10 @@ ( m_size < (unsigned long) config()->readNumEntry("MinimumKeepSize", DEFAULT_MINIMUM_KEEP_SIZE) ) ) { QCString cmd = "DELE "; - cmd += dest.ascii(); + //cmd += dest.ascii(); + // by bumchul + cmd += dest.local8Bit().data(); + (void) ftpSendCmd( cmd, '\0' ); } } @@ -2092,7 +2132,10 @@ } buf="SIZE "; - buf+=path.ascii(); + //buf+=path.ascii(); + // by bumchul + buf+=path.local8Bit().data(); + if (!ftpSendCmd(buf,'2')) { m_size = 0; return false;