From a968f3e92b587c584ae1885d2d35b278eb78ef68 Mon Sep 17 00:00:00 2001
From: Stefan Derkits <stefan@derkits.at>
Date: Mon, 14 May 2012 12:22:45 +0200
Subject: [PATCH] small changes in QtKeychain integration

---
 src/libtomahawk/accounts/Account.cpp | 16 ++++++++--------
 src/libtomahawk/accounts/Account.h   |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/libtomahawk/accounts/Account.cpp b/src/libtomahawk/accounts/Account.cpp
index a1ec6d7b1..16a895fce 100644
--- a/src/libtomahawk/accounts/Account.cpp
+++ b/src/libtomahawk/accounts/Account.cpp
@@ -116,13 +116,13 @@ Account::onError( int errorCode, const QString& error )
 void
 Account::keychainJobFinished(QKeychain::Job* j )
 {
-    if ( j->error() != QKeychain::NoError )
+    if ( j->error() == QKeychain::NoError )
     {
         QKeychain::ReadPasswordJob* readJob = qobject_cast< QKeychain::ReadPasswordJob* >( j );
         if ( readJob != 0 )
         {
             tLog() << Q_FUNC_INFO << "readJob finished without errors";
-            deserializeCredentials( m_credentials, readJob->binaryData() );
+            deserializeCredentials( readJob->binaryData() );
             tLog() << Q_FUNC_INFO << readJob->key();
             tLog() << Q_FUNC_INFO << m_credentials;
         }
@@ -139,24 +139,24 @@ Account::keychainJobFinished(QKeychain::Job* j )
         }
     }
     else
-        tLog() << Q_FUNC_INFO << "Job finished with error: " << j->errorString();
+        tLog() << Q_FUNC_INFO << "Job finished with error: " << j->error() << " " << j->errorString();
     j->deleteLater();
 }
 
 
 void
-Account::serializeCredentials(const QVariantHash& credentials, QByteArray& data)
+Account::serializeCredentials( QByteArray& data )
 {
     QDataStream ds(&data, QIODevice::WriteOnly);
-    ds << credentials;
+    ds << m_credentials;
 }
 
 
 void
-Account::deserializeCredentials(QVariantHash& credentials, const QByteArray& data)
+Account::deserializeCredentials( const QByteArray& data )
 {
     QDataStream ds2(data);
-    ds2 >> credentials;
+    ds2 >> m_credentials;
 }
 
 
@@ -184,7 +184,7 @@ Account::syncConfig()
     j->setKey( m_accountId );
     j->setAutoDelete( false );
     QByteArray bData;
-    serializeCredentials( m_credentials, bData );
+    serializeCredentials( bData );
     j->setBinaryData( bData );
     connect( j, SIGNAL( finished( QKeychain::Job* ) ), this, SLOT( keychainJobFinished( QKeychain::Job* ) ) );
     j->start();
diff --git a/src/libtomahawk/accounts/Account.h b/src/libtomahawk/accounts/Account.h
index 262d796e9..d485d2a34 100644
--- a/src/libtomahawk/accounts/Account.h
+++ b/src/libtomahawk/accounts/Account.h
@@ -147,8 +147,8 @@ private slots:
     void keychainJobFinished( QKeychain::Job* );
 
 private:
-    void serializeCredentials( const QVariantHash& credentials, QByteArray& data );
-    void deserializeCredentials( QVariantHash& credentials, const QByteArray& data );
+    void serializeCredentials( QByteArray& data );
+    void deserializeCredentials( const QByteArray& data );
 
     QString m_accountServiceName;
     QString m_accountFriendlyName;