[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-pim
Subject:    Re: [Kde-pim] imap4 locale bug
From:       Ingo =?iso-8859-15?q?Kl=F6cker?= <kloecker () kde ! org>
Date:       2005-06-27 22:28:23
Message-ID: 200506280028.24157 () erwin ! ingo-kloecker ! de
[Download RAW message or body]

[Attachment #2 (multipart/signed)]


On Monday 27 June 2005 00:31, =?ýso-8859-9?q?Bar=FD=FE_Metin?= wrote:
> My friend from Debian reported other problems with tr_TR, with a
> patch. I've tested the attached patch, may I commit?

If you make the below changes then you can commit.

> Index: kmail/kmmsgbase.cpp
> ===================================================================
> --- kmail/kmmsgbase.cpp    (revision 429071)
> +++ kmail/kmmsgbase.cpp        (working copy)
> @@ -570,7 +571,9 @@
>  const QTextCodec* KMMsgBase::codecForName(const QCString& _str)
>  {
>    if (_str.isEmpty()) return 0;
> -  return KGlobal::charsets()->codecForName(_str.lower());
> +  QCString codec = QCString(_str);

This should be 
+  QCString codec = _str;

> @@ -762,8 +765,13 @@
>    if (charset == "us-ascii") return toUsAscii(_str);
>
>    QCString cset;
> -  if (charset.isEmpty()) cset =
> QCString(kmkernel->networkCodec()->mimeName()).lower();
> -    else 
> cset = charset;
> +  if (charset.isEmpty())
> +  {
> +    cset = QCString(kmkernel->networkCodec()->mimeName());

+    cset = kmkernel->networkCodec()->mimeName();

> @@ -849,7 +857,10 @@
>
>    QCString cset;
>    if ( charset.isEmpty() )
> -    cset = QCString( kmkernel->networkCodec()->mimeName() ).lower();
> +  {
> +    cset = QCString( kmkernel->networkCodec()->mimeName() );

+    cset = kmkernel->networkCodec()->mimeName();

> +    KPIM::kAsciiToLower( cset.data() );
> +  }
>    else
>      cset = charset;
>    const QTextCodec *codec = codecForName( cset );
> @@ -968,7 +979,10 @@
>      {
>         QCString encoding = (*it).latin1();
>         if (encoding == "locale")
> -          encoding =
> QCString(kmkernel->networkCodec()->mimeName()).lower(); 
> +       { 
> +         encoding = QCString(kmkernel->networkCodec()->mimeName());

+         encoding = kmkernel->networkCodec()->mimeName();

> +         KPIM::kAsciiToLower(encoding.data());
> +       }
>         if (text.isEmpty())
>           return encoding;
>         if (encoding == "us-ascii") {
> Index: kmail/configuredialog.cpp
> ===================================================================
> --- kmail/configuredialog.cpp      (revision 429071)
> +++ kmail/configuredialog.cpp  (working copy)
> @@ -74,6 +74,7 @@
>  #include <klocale.h>
>  #include <kapplication.h>
>  #include <kcharsets.h>
> +#include <kasciistringtools.h>
>  #include <kdebug.h>
>  #include <knuminput.h>
>  #include <kfontdialog.h>
> @@ -3000,9 +3001,11 @@
>    QStringList charsets = composer.readListEntry( "pref-charsets" );
>    for ( QStringList::Iterator it = charsets.begin() ;
>          it != charsets.end() ; ++it )
> -      if ( (*it) == QString::fromLatin1("locale") )
> -        (*it) = QString("%1 (locale)")
> -          .arg( QCString( kmkernel->networkCodec()->mimeName()
> ).lower() ); 
> +    if ( (*it) == QString::fromLatin1("locale") ) { 
> +      QCString cset = QCString( kmkernel->networkCodec()->mimeName()
> ); 

+      QCString cset = kmkernel->networkCodec()->mimeName();
 
> +      KPIM::kAsciiToLower( cset.data() ); 
> +      (*it) = QString("%1 (locale)").arg( cset );
> +    }

Regards,
Ingo

[Attachment #5 (application/pgp-signature)]

_______________________________________________
kde-pim mailing list
kde-pim@kde.org
https://mail.kde.org/mailman/listinfo/kde-pim
kde-pim home page at http://pim.kde.org/

[prev in list] [next in list] [prev in thread] [next in thread]