Группа :: Графические оболочки/KDE
Пакет: kdelibs
Главная Изменения Спек Патчи Загрузить Bugs and FR
Патч: kdelibs-3.1.4-ALT-fix-kdoctools-mime-charset.patch
diff -Naur kdelibs-3.1.3.orig/kdoctools/kio_help.cpp kdelibs-3.1.3/kdoctools/kio_help.cpp
--- kdelibs-3.1.4.orig/kdoctools/kio_help.cpp 2003-11-28 15:42:51 +0300
+++ kdelibs-3.1.4/kdoctools/kio_help.cpp 2003-11-28 15:42:56 +0300
@@ -228,7 +228,7 @@
if (parsed.isEmpty()) {
data(fromUnicode( QString(
"<html><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=%1\"></head>\n"
- "%2<br>%3</html>" ).arg( QTextCodec::codecForLocale()->name() ).
+ "%2<br>%3</html>" ).arg( QTextCodec::codecForLocale()->mimeName() ).
arg( i18n( "The requested help file could not be parsed:" ) ).arg( file ) ) );
} else {
QString query = url.query(), anchor;
diff -Naur kdelibs-3.1.3.orig/kdoctools/xslt.cpp kdelibs-3.1.3/kdoctools/xslt.cpp
--- kdelibs-3.1.3.orig/kdoctools/xslt.cpp 2003-08-08 13:44:22 +0400
+++ kdelibs-3.1.3/kdoctools/xslt.cpp 2003-08-08 13:46:58 +0400
@@ -437,8 +437,7 @@
void replaceCharsetHeader( QString &output )
{
- QString name = QTextCodec::codecForLocale()->name();
- name.replace( QRegExp( "ISO " ), "iso-" );
+ QString name = QTextCodec::codecForLocale()->mimeName();
output.replace( QRegExp( "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">" ),
QString( "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=%1\">" ).arg( name ) );
}