From kde-commits  Sat Feb 05 06:42:36 2011
From: Marc Mutz <mutz () kde ! org>
Date: Sat, 05 Feb 2011 06:42:36 +0000
To: kde-commits
Subject: =?utf-8?q?=5Bkdepim/enterprise/e4=5D_kleopatra/commands=3A_Chang?=
Message-Id: <20110205064236.E6935A609B () git ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=129688819516638

Git commit a8670d2cbca0268bf1da09308b2adda64bc500f9 by Marc Mutz.
Committed on 05/02/11 at 07:42.
Pushed by tnyblom into branch 'enterprise/e4'.

ChangePassphraseCommand: in doStart(), only check what we demanded in restrictions()
>
> If this check fails, we finish sliently. This happened for all S/MIME keys.

M  +1    -4    kleopatra/commands/changepassphrasecommand.cpp     

http://commits.kde.org/kdepim/a8670d2cbca0268bf1da09308b2adda64bc500f9

diff --git a/kleopatra/commands/changepassphrasecommand.cpp b/kleopatra/commands/changepassphrasecommand.cpp
index 19fb2b5..bb9adc0 100644
--- a/kleopatra/commands/changepassphrasecommand.cpp
+++ b/kleopatra/commands/changepassphrasecommand.cpp
@@ -123,10 +123,7 @@ ChangePassphraseCommand::~ChangePassphraseCommand() { kDebug(); }
 void ChangePassphraseCommand::doStart() {
 
     const std::vector<Key> keys = d->keys();
-    if ( keys.size() != 1 ||
-         keys.front().protocol() != GpgME::OpenPGP ||
-         !keys.front().hasSecret() ||
-         keys.front().subkey(0).isNull() ) {
+    if ( keys.size() != 1 || !keys.front().hasSecret() ) {
         d->finished();
         return;
     }