merge mac-build-branch with trunk

git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@957 34ebc366-c3a9-4b3c-9f84-69acf7962910

1 files changed, 2 insertions, 2 deletions

diff --git a/main.cpp b/main.cpp
index 19f29cd..5afa441 100644
--- a/main.cpp
+++ b/main.cpp
@@ -56,8 +56,8 @@ int main(int argc, char *argv[])
     putenv(QString("GNUPGHOME=" + appPath + "/keydb").toAscii().data());
     
     // this may help with newer gpgme versions on windows
-    //putenv(QString("GPGME_GPGPATH=" + appPath.replace("/", "\\") + "\\bin\\gpg.exe").toAscii().data());
-
+    putenv(QString("GPGME_GPGPATH=" + appPath + "/gpg-mac").toAscii().data());
+	qDebug() << appPath + "/gpg-mac";
     // QSettings uses org-name for automatically setting path...
     app.setOrganizationName("conf");