status-im
/
qtkeychain
mirror of https://github.com/status-im/qtkeychain.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '0.6'

This commit is contained in:
Frank Osterfeld 2016-04-04 17:56:37 +01:00
parent 36592711fc 75e7f148f4
commit 1e7ffafee9
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,6 +1,12 @@
ChangeLog ChangeLog
========= =========
version 0.6.2 (release 2016-04-04)
* KWallet: Fixes a crash when storing passwords, seen on Debian/KDE4
version 0.6.1 (release 2016-03-31)
* Fix KWallet not working (regressions in 0.6.0)
version 0.6.0 (release 2016-03-18) version 0.6.0 (release 2016-03-18)
* Added support for the Windows Credential Store * Added support for the Windows Credential Store

8
keychain_unix.cpp
View File

@ -333,12 +333,16 @@ void ReadPasswordJobPrivate::kwalletFinished( QDBusPendingCallWatcher* watcher )
if ( !watcher->isError() ) { if ( !watcher->isError() ) {
if ( mode == Binary ) { if ( mode == Binary ) {
QDBusPendingReply<QByteArray> reply = *watcher; QDBusPendingReply<QByteArray> reply = *watcher;
if (reply.isValid()) {
data = reply.value(); data = reply.value();
}
} else { } else {
QDBusPendingReply<QString> reply = *watcher; QDBusPendingReply<QString> reply = *watcher;
if (reply.isValid()) {
data = reply.value().toUtf8(); data = reply.value().toUtf8();
} }
} }
}
JobPrivate::kwalletFinished(watcher); JobPrivate::kwalletFinished(watcher);
} }
@ -468,12 +472,16 @@ void JobPrivate::kwalletFinished( QDBusPendingCallWatcher* watcher ) {
if ( !watcher->isError() ) { if ( !watcher->isError() ) {
if ( mode == Binary ) { if ( mode == Binary ) {
QDBusPendingReply<QByteArray> reply = *watcher; QDBusPendingReply<QByteArray> reply = *watcher;
if (reply.isValid()) {
data = reply.value(); data = reply.value();
}
} else { } else {
QDBusPendingReply<QString> reply = *watcher; QDBusPendingReply<QString> reply = *watcher;
if (reply.isValid()) {
data = reply.value().toUtf8(); data = reply.value().toUtf8();
} }
} }
}
q->emitFinished(); q->emitFinished();
} }