summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2018-12-02 00:51:33 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2018-12-02 00:51:33 +0900
commit698716c1dead3ac5ea317c8c2d1364686d8d4d51 (patch)
tree5221d06952a7e5a31d8cfc9f34599487d692845f /src
parent9af16309a17ebf562d4014ea430551c08820e799 (diff)
downloadbasket-698716c1dead3ac5ea317c8c2d1364686d8d4d51.tar.gz
basket-698716c1dead3ac5ea317c8c2d1364686d8d4d51.zip
Adapted to new KPasswordEdit::password() signature. This relates to bug 2961.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'src')
-rw-r--r--src/kgpgme.cpp5
-rw-r--r--src/kgpgme.h2
2 files changed, 4 insertions, 3 deletions
diff --git a/src/kgpgme.cpp b/src/kgpgme.cpp
index 18a5e01..026d2d3 100644
--- a/src/kgpgme.cpp
+++ b/src/kgpgme.cpp
@@ -420,7 +420,7 @@ gpgme_error_t KGpgMe::passphrase(const char* uid_hint,
s += gpg_hint;
if(m_cache.isEmpty()){
- TQCString password;
+ TQString password;
if(m_saving)
result = KPasswordDialog::getNewPassword(password, s);
@@ -434,7 +434,8 @@ gpgme_error_t KGpgMe::passphrase(const char* uid_hint,
result = KPasswordDialog::Accepted;
if(result == KPasswordDialog::Accepted) {
- write(fd, m_cache.data(), m_cache.length());
+ TQCString m_cache2 = m_cache.local8Bit();
+ write(fd, m_cache2.data(), m_cache2.length());
res = 0;
}
write(fd, "\n", 1);
diff --git a/src/kgpgme.h b/src/kgpgme.h
index e514500..1cbf3f8 100644
--- a/src/kgpgme.h
+++ b/src/kgpgme.h
@@ -69,7 +69,7 @@ class KGpgMe
TQString m_text;
bool m_saving;
bool m_useGnuPGAgent;
- TQCString m_cache;
+ TQString m_cache;
void init(gpgme_protocol_t proto);
gpgme_error_t readToBuffer(gpgme_data_t in, TQByteArray* outBuffer) const;