[Pkg-owncloud-commits] [qtkeychain] 89/115: Focus on the text in OSStatus error messages.

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository qtkeychain.

commit 45bf9eb7ca1e32390e44d15bb07b58133b4f35a1
Author: Teo Mrnjavac <teo at kde.org>
Date:   Mon Nov 18 11:11:05 2013 +0100

    Focus on the text in OSStatus error messages.
---
 keychain_mac.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/keychain_mac.cpp b/keychain_mac.cpp
index 99e1cc9..6cac39a 100644
--- a/keychain_mac.cpp
+++ b/keychain_mac.cpp
@@ -28,9 +28,10 @@ static QString strForStatus( OSStatus os ) {
     const Releaser<CFStringRef> str( SecCopyErrorMessageString( os, 0 ) );
     const char * const buf = CFStringGetCStringPtr( str.value,  kCFStringEncodingUTF8 );
     if ( !buf )
-        return QObject::tr( "OSX Keychain OSStatus code %1" ).arg( os );
-    return QObject::tr( "OSX Keychain OSStatus code %1: \"%2\"" ).arg( os )
-            .arg( QString::fromUtf8( buf, strlen( buf ) ) );
+        return QObject::tr( "%1 (OSStatus %2)" )
+            .arg( "OSX Keychain Error" ).arg( os );
+    return QObject::tr( "%1 (OSStatus %2)" )
+        .arg( QString::fromUtf8( buf, strlen( buf ) ) ).arg( os );
 }
 
 static OSStatus readPw( QByteArray* pw,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/qtkeychain.git