4
0
mirror of https://github.com/QuasarApp/qca.git synced 2025-05-13 02:59:34 +00:00

Fixed tokenPrompt to cancel if no entry

svn path=/trunk/kdesupport/qca/; revision=650951
This commit is contained in:
Alon Bar-Lev 2007-04-05 22:05:48 +00:00
parent c72c12a5ff
commit 21ef16c880

@ -1908,7 +1908,7 @@ pkcs11KeyStoreList::tokenPrompt (
void * const user_data,
const pkcs11h_token_id_t token_id
) {
bool ret;
bool ret = false;
Q_UNUSED(token_id);
@ -1921,16 +1921,22 @@ pkcs11KeyStoreList::tokenPrompt (
Logger::Debug
);
QString *serialized = (QString *)user_data;
KeyStoreEntryContext *entry = entryPassive (QString (), *serialized);
/*
* Justin asked to cancel if no
* evailable entry.
*/
if (user_data != NULL) {
QString *serialized = (QString *)user_data;
KeyStoreEntryContext *entry = entryPassive (QString (), *serialized);
TokenAsker asker;
asker.ask (
entry->id (),
entry
);
asker.waitForResponse ();
ret = asker.accepted ();
TokenAsker asker;
asker.ask (
entry->id (),
entry
);
asker.waitForResponse ();
ret = asker.accepted ();
}
logger ()->logTextMessage (
QString ().sprintf (