|
|
@ -478,10 +478,16 @@ int TDEWalletD::internalOpen(const TQCString& appid, const TQString& wallet, boo
|
|
|
|
if (kpd->exec() == KDialog::Accepted) {
|
|
|
|
if (kpd->exec() == KDialog::Accepted) {
|
|
|
|
p = kpd->password();
|
|
|
|
p = kpd->password();
|
|
|
|
int rc = b->open(TQByteArray().duplicate(p, strlen(p)));
|
|
|
|
int rc = b->open(TQByteArray().duplicate(p, strlen(p)));
|
|
|
|
|
|
|
|
if (!b->isOpen()) {
|
|
|
|
|
|
|
|
// For compatibility with TDE << R14.0.6, try ascii() as fallback option in case of errors
|
|
|
|
|
|
|
|
TQString pw8Bit = TQString::fromLocal8Bit(p);
|
|
|
|
|
|
|
|
p = pw8Bit.ascii();
|
|
|
|
|
|
|
|
rc = b->open(TQByteArray().duplicate(p, strlen(p)));
|
|
|
|
if (!b->isOpen()) {
|
|
|
|
if (!b->isOpen()) {
|
|
|
|
kpd->setPrompt(i18n("<qt>Error opening the wallet '<b>%1</b>'. Please try again.<br>(Error code %2: %3)").arg(TQStyleSheet::escape(wallet)).arg(rc).arg(TDEWallet::Backend::openRCToString(rc)));
|
|
|
|
kpd->setPrompt(i18n("<qt>Error opening the wallet '<b>%1</b>'. Please try again.<br>(Error code %2: %3)").arg(TQStyleSheet::escape(wallet)).arg(rc).arg(TDEWallet::Backend::openRCToString(rc)));
|
|
|
|
kpd->clearPassword();
|
|
|
|
kpd->clearPassword();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|