diff options
| author | ubbo <ubbo@34ebc366-c3a9-4b3c-9f84-69acf7962910> | 2012-08-02 09:08:31 +0000 |
|---|---|---|
| committer | ubbo <ubbo@34ebc366-c3a9-4b3c-9f84-69acf7962910> | 2012-08-02 09:08:31 +0000 |
| commit | baa5b82df130ec01abbd382f5a3109a06014fcc4 (patch) | |
| tree | 3dee9c63bdebd1f70621de39212a6dede08d787d | |
| parent | mac fixes (diff) | |
| download | gpg4usb-baa5b82df130ec01abbd382f5a3109a06014fcc4.tar.gz gpg4usb-baa5b82df130ec01abbd382f5a3109a06014fcc4.zip | |
set homedir
git-svn-id: http://cpunk.de/svn/src/gpg4usb/branches/0.3.2-mac@925 34ebc366-c3a9-4b3c-9f84-69acf7962910
| -rw-r--r-- | kgpg/gpgproc.cpp | 10 | ||||
| -rw-r--r-- | kgpg/kgpginterface.cpp | 1 | ||||
| -rw-r--r-- | kgpg/kprocess.cpp | 3 |
3 files changed, 10 insertions, 4 deletions
diff --git a/kgpg/gpgproc.cpp b/kgpg/gpgproc.cpp index b308ab5..075fc91 100644 --- a/kgpg/gpgproc.cpp +++ b/kgpg/gpgproc.cpp @@ -113,7 +113,8 @@ void GnupgBinary::setBinary(const QString &executable) m_standardArguments.clear(); m_standardArguments << QLatin1String( "--no-secmem-warning" ) << QLatin1String( "--no-tty" ) - << QLatin1String("--no-greeting"); + << QLatin1String("--no-greeting") + << QLatin1String("--homedir") << GPGProc::getGpgHome(""); if (!gpgConfigFile.isEmpty()) m_standardArguments << QLatin1String("--options") @@ -332,7 +333,7 @@ QString GPGProc::getGpgHome(const QString &binary) { // First try: if environment is set GnuPG will use that directory // We can use this directly without starting a new process - QByteArray env(qgetenv("GNUPGHOME")); +/* QByteArray env(qgetenv("GNUPGHOME")); QString gpgHome; if (!env.isEmpty()) { gpgHome = QLatin1String( env ); @@ -359,7 +360,10 @@ QString GPGProc::getGpgHome(const QString &binary) if (gpgHome.startsWith(QLatin1Char( '~' ))) gpgHome.replace(0, 1, QDir::homePath()); - //KStandardDirs::makeDir(gpgHome, 0700); + //KStandardDirs::makeDir(gpgHome, 0700);*/ + QString appPath = qApp->applicationDirPath(); + QString gpgHome = appPath + "/keydb"; + return gpgHome; } diff --git a/kgpg/kgpginterface.cpp b/kgpg/kgpginterface.cpp index f430a84..90dea2d 100644 --- a/kgpg/kgpginterface.cpp +++ b/kgpg/kgpginterface.cpp @@ -307,6 +307,7 @@ KgpgKeyList KgpgInterface::readPublicKeys(const QStringList &ids) QLatin1String("--with-colons") << QLatin1String("--with-fingerprint") << QLatin1String("--fixed-list-mode") << + QLatin1String("--homedir") << GPGProc::getGpgHome("") << QLatin1String("--list-keys") << ids; diff --git a/kgpg/kprocess.cpp b/kgpg/kprocess.cpp index a5b8628..907c75c 100644 --- a/kgpg/kprocess.cpp +++ b/kgpg/kprocess.cpp @@ -28,6 +28,7 @@ //#endif #include <qfile.h> +#include <QDebug> #ifdef Q_OS_WIN # include <windows.h> @@ -340,7 +341,7 @@ QStringList KProcess::program() const void KProcess::start() { Q_D(KProcess); - + qDebug() << "prog: " << d->prog << " | args: " << d->args; QProcess::start(d->prog, d->args, d->openMode); } |