diff options
Diffstat (limited to 'kgpg/gpgproc.cpp')
| -rw-r--r-- | kgpg/gpgproc.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/kgpg/gpgproc.cpp b/kgpg/gpgproc.cpp index 8ed8b45..b308ab5 100644 --- a/kgpg/gpgproc.cpp +++ b/kgpg/gpgproc.cpp @@ -168,7 +168,7 @@ GPGProc::resetProcess(const QString &binary) gpgBin = appPath + "/bin/gpg.exe"; #endif #ifdef Q_WS_MAC - gpgBin = appPath + "/bin/gpg-mac.app"; + gpgBin = appPath + "/gpg-mac"; #endif #ifdef Q_WS_X11 gpgBin = appPath + "/bin/gpg"; @@ -179,7 +179,7 @@ GPGProc::resetProcess(const QString &binary) if (bin->binary() != executable) bin->setBinary(executable); - + qDebug() << "ex: " << executable; setProgram(executable, bin->standardArguments()); setOutputChannelMode(OnlyStdoutChannel); @@ -294,14 +294,19 @@ QString GPGProc::gpgVersionString(const QString &binary) process.start(); process.waitForFinished(-1); - if (process.exitCode() == 255) + if (process.exitCode() == 255) { + qDebug() << "exit255"; return QString(); + } QString line; - if (process.readln(line) != -1) - return line.simplified().section(QLatin1Char( ' ' ), -1); - else + if (process.readln(line) != -1) { + qDebug() << line; + return line.simplified().section(QLatin1Char( ' ' ), -1); + } else { + qDebug() << "no readln"; return QString(); + } } QString GPGProc::getGpgStartupError(const QString &binary) |