[Pkg-owncloud-commits] [qtkeychain] 15/35: fix kwallet

[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 36592711fc1f2666deebb9ded17f33f4437e0fdb
Author: Ole-André Rodlie <olear at dracolinux.org>
Date:   Thu Mar 31 20:59:24 2016 +0200

    fix kwallet
---
 keychain_unix.cpp | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/keychain_unix.cpp b/keychain_unix.cpp
index e83f33f..8f44098 100644
--- a/keychain_unix.cpp
+++ b/keychain_unix.cpp
@@ -326,18 +326,18 @@ void ReadPasswordJobPrivate::kwalletEntryTypeFinished( QDBusPendingCallWatcher*
             ? QDBusPendingCall( iface->readPassword( walletHandle, q->service(), key, q->service() ) )
             : QDBusPendingCall( iface->readEntry( walletHandle, q->service(), key, q->service() ) );
     QDBusPendingCallWatcher* nextWatcher = new QDBusPendingCallWatcher( nextReply, this );
-    connect( nextWatcher, SIGNAL(finished(QDBusPendingCallWatcher*)), this, SLOT(kwalletReadFinished(QDBusPendingCallWatcher*)) );
+    connect( nextWatcher, SIGNAL(finished(QDBusPendingCallWatcher*)), this, SLOT(kwalletFinished(QDBusPendingCallWatcher*)) );
 }
 
 void ReadPasswordJobPrivate::kwalletFinished( QDBusPendingCallWatcher* watcher ) {
     if ( !watcher->isError() ) {
-    if ( mode == Binary ) {
-        QDBusPendingReply<QByteArray> reply = *watcher;
-        data = reply.value();
-    } else {
-        QDBusPendingReply<QString> reply = *watcher;
-        data = reply.value().toUtf8();
-    }
+        if ( mode == Binary ) {
+            QDBusPendingReply<QByteArray> reply = *watcher;
+            data = reply.value();
+        } else {
+            QDBusPendingReply<QString> reply = *watcher;
+            data = reply.value().toUtf8();
+        }
     }
 
     JobPrivate::kwalletFinished(watcher);
@@ -461,17 +461,18 @@ void JobPrivate::kwalletOpenFinished( QDBusPendingCallWatcher* watcher ) {
         nextReply = iface->removeEntry( handle, q->service(), key, q->service() );
 
     QDBusPendingCallWatcher* nextWatcher = new QDBusPendingCallWatcher( nextReply, this );
-    connect( nextWatcher, SIGNAL(finished(QDBusPendingCallWatcher*)), this, SLOT(kwalletWriteFinished(QDBusPendingCallWatcher*)) );
+    connect( nextWatcher, SIGNAL(finished(QDBusPendingCallWatcher*)), this, SLOT(kwalletFinished(QDBusPendingCallWatcher*)) );
 }
 
 void JobPrivate::kwalletFinished( QDBusPendingCallWatcher* watcher ) {
-    watcher->deleteLater();
-    QDBusPendingReply<int> reply = *watcher;
-    if ( reply.isError() ) {
-        const QDBusError err = reply.error();
-        q->emitFinishedWithError( OtherError, tr("Could not open wallet: %1; %2")
-                                  .arg( QDBusError::errorString( err.type() ), err.message() ) );
-        return;
+    if ( !watcher->isError() ) {
+        if ( mode == Binary ) {
+            QDBusPendingReply<QByteArray> reply = *watcher;
+            data = reply.value();
+        } else {
+            QDBusPendingReply<QString> reply = *watcher;
+            data = reply.value().toUtf8();
+        }
     }
 
     q->emitFinished();

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