alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

better name for the method that imports ulimately trusted keys

Browse Source
This commit is contained in:
Aaron Seigo 2011-05-24 11:18:03 +02:00
parent 4766f0e63e
commit 5496456af4
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
remote/signing.cpp
View File

@ -100,7 +100,7 @@ SigningPrivate::~SigningPrivate()
delete m_KdeKeysDir; delete m_KdeKeysDir;
} }
void SigningPrivate::importKdeKeysToKeystore() void SigningPrivate::registerUltimateTrustKeys()
{ {
QList< QByteArray > tmp; QList< QByteArray > tmp;
if (!m_gpgContext) { if (!m_gpgContext) {
@ -157,7 +157,7 @@ void SigningPrivate::splitKeysByTrustLevel()
// Splitting the keys by their trust level is a boring task, since we have to distinguish // Splitting the keys by their trust level is a boring task, since we have to distinguish
// `which key has been signed with an other given key` :P // `which key has been signed with an other given key` :P
// //
// Loop 1: import and load the KDE keys, already done in importKdeKeysToKeystore() // Loop 1: import and load the KDE keys, already done in registerUltimateTrustKeys()
// //
// Loop 2: load the user keyring (private keys only), and loop for: // Loop 2: load the user keyring (private keys only), and loop for:
// - a: a key not yet expired; // - a: a key not yet expired;
@ -479,7 +479,7 @@ void SigningPrivate::slotKDEKeyRemoved(const QString path)
m_keystoreDir->stopScan(); m_keystoreDir->stopScan();
QList<QByteArray> oldKeys = keys[UltimatelyTrusted]; QList<QByteArray> oldKeys = keys[UltimatelyTrusted];
importKdeKeysToKeystore(); registerUltimateTrustKeys();
QList<QByteArray> newkeys = keys[UltimatelyTrusted]; QList<QByteArray> newkeys = keys[UltimatelyTrusted];
QString result; QString result;
@ -558,7 +558,7 @@ Signing::Signing(const QString &keystorePath)
: QObject(), : QObject(),
d(new SigningPrivate(this, keystorePath)) d(new SigningPrivate(this, keystorePath))
{ {
d->importKdeKeysToKeystore(); d->registerUltimateTrustKeys();
d->splitKeysByTrustLevel(); d->splitKeysByTrustLevel();
} }

2
remote/signing_p.h
View File

@ -48,7 +48,7 @@ public:
// Note: keys[CompletelyUntrusted] refers to an empty list // Note: keys[CompletelyUntrusted] refers to an empty list
QMap<TrustLevel, QList<QByteArray> > keys; QMap<TrustLevel, QList<QByteArray> > keys;
void importKdeKeysToKeystore(); void registerUltimateTrustKeys();
void splitKeysByTrustLevel(); void splitKeysByTrustLevel();
QStringList keysID(const bool returnPrivate) const; QStringList keysID(const bool returnPrivate) const;
QString signerOf(const QString &messagePath, const QString &signaturePath) const; QString signerOf(const QString &messagePath, const QString &signaturePath) const;