Adapted to new KPasswordEdit::password() signature. This relates to bug 2961.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/1/head
Michele Calgaro 6 years ago
parent 22434b2707
commit e58aec2eb2
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -180,7 +180,7 @@ bool KGPGFile::open(int mode, const TQString& cmdArgs, bool skipPasswd)
args = TQStringList::split(" ", cmdArgs);
}
TQCString pwd;
TQString pwd;
if(isReadable() && useOwnPassphrase && !skipPasswd) {
KPasswordDialog dlg(KPasswordDialog::Password,false,0);
dlg.setPrompt(i18n("Enter passphrase"));
@ -188,7 +188,7 @@ bool KGPGFile::open(int mode, const TQString& cmdArgs, bool skipPasswd)
dlg.adjustSize();
if (dlg.exec() == TQDialog::Rejected)
return false;
pwd = TQCString(dlg.password());
pwd = dlg.password();
}
// tqDebug("starting GPG process");
@ -209,8 +209,9 @@ bool KGPGFile::open(int mode, const TQString& cmdArgs, bool skipPasswd)
}
if(isReadable() && useOwnPassphrase && !skipPasswd) {
// tqDebug("Passphrase is '%s'", pwd.data());
if(_writeBlock(pwd.data(), pwd.length()) == -1) {
TQCString pwd2 = pwd.local8Bit(); // Local 8 bit length can be different from TQString length
// tqDebug("Passphrase is '%s'", pwd2.data());
if(_writeBlock(pwd2.data(), pwd2.length()) == -1) {
// tqDebug("Sending passphrase failed");
return false;
}

@ -45,7 +45,7 @@ class TDEProcess;
*
* +------------------+ write +-----------+ stdin +-------+ +--------+
* | |--------->|\ |---------->| |---->| |
* | Application code | read | TQFile | stdout | GPG | | File |
* | Application code | read | TQFile | stdout | GPG | | File |
* | |<---------|/ |<----------| |<----| |
* +------------------+ | KGPGFile | +-------+ +--------+
* | control| |

Loading…
Cancel
Save