Update to latest Upstream version

epel9
Joseph Marrero 11 years ago
parent 8e4a860d98
commit 11a6bf156e

1
.gitignore vendored

@ -1 +1,2 @@
/qtkeychain-0.20130805.tar.bz2
/qtkeychain-0.3.0.tar.gz

@ -1,12 +1,10 @@
Name: qtkeychain
Version: 0.1.0
Release: 4.20130805git%{?dist}
Version: 0.3.0
Release: 1%{?dist}
License: BSD
Summary: A password store library
Url: https://github.com/frankosterfeld/qtkeychain
Source0: %{name}-0.20130805.tar.bz2
Patch0: use_network_wallet.diff
Source0: %{name}-%{version}.tar.bz2
BuildRequires: cmake
BuildRequires: qt4-devel
@ -22,9 +20,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
This package contains development files for qtkeychain.
%prep
%setup -q -n %{name}-0.20130805
%patch0 -p1
%setup -q -n %{name}-%{version}
%build
mkdir build
@ -59,6 +55,9 @@ popd
%{_libdir}/libqtkeychain.so
%changelog
* Sun Mar 16 2014 <jmarrero@fedoraproject.org> 0.3.0-1
- Update to latest upstream version
* Tue Jan 07 2014 <jmarrero@fedoraproject.org> 0.1.0-4.20130805git
- Remove gcc-c++ dep
- Fix Requires

@ -1 +1 @@
91a3f9f6d35fe5b6e361f9acaa9f8865 qtkeychain-0.20130805.tar.bz2
68808847d38472036347de6a0c4d19d2 qtkeychain-0.3.0.tar.gz

@ -1,44 +0,0 @@
diff --git a/keychain_dbus.cpp b/keychain_dbus.cpp
index 4b39348..15e0ee1 100644
--- a/keychain_dbus.cpp
+++ b/keychain_dbus.cpp
@@ -170,9 +170,9 @@ void ReadPasswordJobPrivate::scheduledStart() {
if ( QDBusConnection::sessionBus().isConnected() )
{
iface = new org::kde::KWallet( QLatin1String("org.kde.kwalletd"), QLatin1String("/modules/kwalletd"), QDBusConnection::sessionBus(), this );
- const QDBusPendingReply<int> reply = iface->open( QLatin1String("kdewallet"), 0, q->service() );
+ const QDBusPendingReply<QString> reply = iface->networkWallet();
QDBusPendingCallWatcher* watcher = new QDBusPendingCallWatcher( reply, this );
- connect( watcher, SIGNAL(finished(QDBusPendingCallWatcher*)), this, SLOT(kwalletOpenFinished(QDBusPendingCallWatcher*)) );
+ connect( watcher, SIGNAL(finished(QDBusPendingCallWatcher*)), this, SLOT(kwalletWalletFound(QDBusPendingCallWatcher*)) );
}
else
{
@@ -184,6 +184,15 @@ void ReadPasswordJobPrivate::scheduledStart() {
}
}
+void ReadPasswordJobPrivate::kwalletWalletFound(QDBusPendingCallWatcher *watcher)
+{
+ watcher->deleteLater();
+ const QDBusPendingReply<QString> reply = *watcher;
+ const QDBusPendingReply<int> pendingReply = iface->open( reply.value(), 0, q->service() );
+ QDBusPendingCallWatcher* pendingWatcher = new QDBusPendingCallWatcher( pendingReply, this );
+ connect( pendingWatcher, SIGNAL(finished(QDBusPendingCallWatcher*)), this, SLOT(kwalletOpenFinished(QDBusPendingCallWatcher*)) );
+}
+
static QPair<Error, QString> mapGnomeKeyringError( int result )
{
Q_ASSERT( result != GnomeKeyring::RESULT_OK );
diff --git a/keychain_p.h b/keychain_p.h
index 4facbc6..31fad8a 100644
--- a/keychain_p.h
+++ b/keychain_p.h
@@ -74,6 +74,7 @@ class ReadPasswordJobPrivate : public QObject {
const QString typeKey();
const QString dataKey();
private Q_SLOTS:
+ void kwalletWalletFound( QDBusPendingCallWatcher* watcher );
void kwalletOpenFinished( QDBusPendingCallWatcher* watcher );
void kwalletEntryTypeFinished( QDBusPendingCallWatcher* watcher );
void kwalletReadFinished( QDBusPendingCallWatcher* watcher );
Loading…
Cancel
Save