QuasarApp/qca
4
0
Fork 0
mirror of https://github.com/QuasarApp/qca.git synced 2025-05-02 14:19:34 +00:00
Code Issues Projects Releases Wiki Activity

if entry not available, fall back to just store

Browse Source 
svn path=/trunk/kdesupport/qca/; revision=650630
This commit is contained in:
Justin Karneges 2007-04-05 00:01:12 +00:00
parent cc465c9b2f
commit 83cac8dd60
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tools/qcatool/main.cpp
View File

@ -225,12 +225,15 @@ private slots:
QCA::KeyStoreEntry entry(e.keyStoreEntryId()); QCA::KeyStoreEntry entry(e.keyStoreEntryId());
if(!entry.isNull()) if(!entry.isNull())
{ {
// TODO: enable this once we guarantee objects existing ?
//if(entry.type() == QCA::KeyStoreEntry::TypePGPSecretKey)
// name = entry.pgpSecretKey().primaryUserId();
//else
name = entry.name(); name = entry.name();
} }
else
{
QCA::KeyStoreManager ksm;
QCA::KeyStore store(e.keyStoreId(), &ksm);
if(store.isValid())
name = store.name();
}
str = QString("Enter %1 for %2").arg(type).arg(name); str = QString("Enter %1 for %2").arg(type).arg(name);
} }
else else
@ -242,7 +245,19 @@ private slots:
else if(e.type() == QCA::Event::Token) else if(e.type() == QCA::Event::Token)
{ {
QCA::KeyStoreEntry entry(e.keyStoreEntryId()); QCA::KeyStoreEntry entry(e.keyStoreEntryId());
printf("Please insert %s for [%s] and press Enter ...\n", qPrintable(entry.storeName()), qPrintable(entry.name())); QString name;
if(!entry.isNull())
{
name = entry.storeName() + " for " + entry.name();
}
else
{
QCA::KeyStoreManager ksm;
QCA::KeyStore store(e.keyStoreId(), &ksm);
if(store.isValid())
name = store.name();
}
printf("Please insert %s and press Enter ...\n", qPrintable(name));
QCA::ConsolePrompt::waitForEnter(); QCA::ConsolePrompt::waitForEnter();
handler.tokenOkay(id); handler.tokenOkay(id);
} }