epel8
Rex Dieter 8 years ago
parent 179e9f6f8d
commit e20f483a7d

1
.gitignore vendored

@ -7,3 +7,4 @@
/kwallet-5.24.0.tar.xz
/kwallet-5.25.0.tar.xz
/kwallet-5.26.0.tar.xz
/kwallet-5.27.0.tar.xz

@ -1,28 +0,0 @@
diff --git a/src/api/KWallet/kwallet.cpp b/src/api/KWallet/kwallet.cpp
index dffebda..15be0eb 100644
--- a/src/api/KWallet/kwallet.cpp
+++ b/src/api/KWallet/kwallet.cpp
@@ -363,14 +363,16 @@ bool Wallet::isOpen(const QString &name)
}
} else {
#endif
- QDBusReply<bool> r = walletLauncher()->getInterface().isOpen(name);
+ if (walletLauncher()->m_walletEnabled) {
+ QDBusReply<bool> r = walletLauncher()->getInterface().isOpen(name);
- if (!r.isValid()) {
- qDebug() << "Invalid DBus reply: " << r.error();
- return false;
- } else {
- return r;
- }
+ if (!r.isValid()) {
+ qDebug() << "Invalid DBus reply: " << r.error();
+ return false;
+ } else {
+ return r;
+ }
+ } else return false;
#if HAVE_KSECRETSSERVICE
}
#endif

@ -8,8 +8,8 @@
%endif
Name: kf5-%{framework}
Version: 5.26.0
Release: 2%{?dist}
Version: 5.27.0
Release: 1%{?dist}
Summary: KDE Frameworks 5 Tier 3 solution for password management
License: LGPLv2+
@ -27,8 +27,6 @@ Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{fra
## upstream patches
## upstreamable patches
# https://git.reviewboard.kde.org/r/128831
Patch100: fix-isOpen-crash-when-wallet-disabled.patch
BuildRequires: extra-cmake-modules >= %{version}
BuildRequires: kf5-kconfig-devel >= %{version}
@ -130,6 +128,9 @@ make test ARGS="--output-on-failure --timeout 30" -C %{_target_platform} ||:
%changelog
* Tue Oct 04 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.27.0-1
- 5.27.0
* Tue Sep 20 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.26.0-2
- enable gpgme support (#1377814)
- %%check: enable tests

@ -1 +1 @@
8865e8f7eb9014d6ca5ff5986af55773 kwallet-5.26.0.tar.xz
012d0e05887ede47f221d08474213dd8 kwallet-5.27.0.tar.xz

Loading…
Cancel
Save