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

List:       kde-commits
Subject:    KDE/kdepim/libkleo/backends/qgpgme
From:       Allen Winter <winter () kde ! org>
Date:       2007-08-06 14:53:55
Message-ID: 1186412035.363798.22304.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 697011 by winterz:

forward port SVN commit 684042 by cartman:

errors from the operating system should be filtered through QString::fromLocal8Bit()

CCMAIL: ismail@kde.org


 M  +2 -2      qgpgmecryptoconfig.cpp  


--- trunk/KDE/kdepim/libkleo/backends/qgpgme/qgpgmecryptoconfig.cpp #697010:697011
@@ -100,7 +100,7 @@
     else if ( rc == -2 )
         reason = i18n( "program not found or cannot be started" );
     else
-        reason = strerror(rc); // XXX errno as an exit code?
+      reason = QString::fromLocal8Bit( strerror(rc) ); // XXX errno as an exit code?
     QString wmsg = i18n("<qt>Failed to execute gpgconf:<p>%1</p></qt>", reason);
     kWarning(5150) << wmsg; // to see it from test_cryptoconfig.cpp
     KMessageBox::error(0, wmsg);
@@ -331,7 +331,7 @@
   }
   else if( rc != 0 ) // Happens due to bugs in gpgconf (e.g. issues 104/115)
   {
-    QString wmsg = i18n( "Error from gpgconf while saving configuration: %1", \
strerror( rc ) ); +    QString wmsg = i18n( "Error from gpgconf while saving \
configuration: %1", QString::fromLocal8Bit( strerror( rc ) ) );  kWarning(5150) << \
k_funcinfo <<":" << strerror( rc );  KMessageBox::error(0, wmsg);
   }


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