From 987768c54d8f0c0ead70395057172ae765fae064 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Sun, 30 Dec 2018 02:52:55 +0100
Subject: [PATCH] Fixed access to TDE wallets created before R14.0.6 that uses
 special non-ascii characters in their password.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
---
 tdeio/misc/tdewalletd/tdewalletd.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tdeio/misc/tdewalletd/tdewalletd.cpp b/tdeio/misc/tdewalletd/tdewalletd.cpp
index 5d73df4e6..a9b333288 100644
--- a/tdeio/misc/tdewalletd/tdewalletd.cpp
+++ b/tdeio/misc/tdewalletd/tdewalletd.cpp
@@ -479,8 +479,14 @@ int TDEWalletD::internalOpen(const TQCString& appid, const TQString& wallet, boo
 				p = kpd->password();
 				int rc = b->open(TQByteArray().duplicate(p, strlen(p)));
 				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->clearPassword();
+					// 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()) {
+						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();
+					}
 				}
 			} else {
 				break;