diff options
| author | ubbo <ubbo@34ebc366-c3a9-4b3c-9f84-69acf7962910> | 2012-08-02 01:00:53 +0000 |
|---|---|---|
| committer | ubbo <ubbo@34ebc366-c3a9-4b3c-9f84-69acf7962910> | 2012-08-02 01:00:53 +0000 |
| commit | efa0647677c910f549e27742a4f32654d7fb3300 (patch) | |
| tree | bf2d5b8e78bfb29eeb6e10e44b31cdd11ceef12b | |
| parent | try to integrate gpg wrapper from kgpg - broken now (diff) | |
| download | gpg4usb-efa0647677c910f549e27742a4f32654d7fb3300.tar.gz gpg4usb-efa0647677c910f549e27742a4f32654d7fb3300.zip | |
fix build
git-svn-id: http://cpunk.de/svn/src/gpg4usb/branches/0.3.2-mac@922 34ebc366-c3a9-4b3c-9f84-69acf7962910
| -rw-r--r-- | gpg4usb.pro | 5 | ||||
| -rw-r--r-- | gpgcontext.cpp | 6 | ||||
| -rw-r--r-- | kgpg/gpgproc.cpp | 3 |
3 files changed, 9 insertions, 5 deletions
diff --git a/gpg4usb.pro b/gpg4usb.pro index f8f9ace..baa82e4 100644 --- a/gpg4usb.pro +++ b/gpg4usb.pro @@ -13,9 +13,10 @@ INCLUDEPATH += . \ #DEFINES += GPG4USB_NON_PORTABLE -CONFIG += release static +#CONFIG += release static #CONFIG += release -#CONFIG += debug +CONFIG += debug + QT += network # Input HEADERS += attachments.h \ diff --git a/gpgcontext.cpp b/gpgcontext.cpp index 534ddea..9ed13b4 100644 --- a/gpgcontext.cpp +++ b/gpgcontext.cpp @@ -213,7 +213,7 @@ GpgKeyList GpgContext::listKeys() GpgKeyList keys; GPGProc process(this, gpgBin); -/* process << + process << QLatin1String("--with-colons") << QLatin1String("--with-fingerprint") << QLatin1String("--fixed-list-mode") << @@ -222,7 +222,9 @@ GpgKeyList GpgContext::listKeys() process.setOutputChannelMode(KProcess::MergedChannels); process.start(); - process.waitForFinished(-1);*/ + process.waitForFinished(-1); + + //while (item == process->) // return readPublicKeysProcess(process, NULL); diff --git a/kgpg/gpgproc.cpp b/kgpg/gpgproc.cpp index 291e8a2..a834be4 100644 --- a/kgpg/gpgproc.cpp +++ b/kgpg/gpgproc.cpp @@ -32,6 +32,7 @@ public: const QStringList &standardArguments() const; unsigned int version() const; bool supportsDebugLevel() const; + //static GnupgBinary* instance(); private: QString m_binary; @@ -154,7 +155,7 @@ GPGProc::~GPGProc() void GPGProc::resetProcess(const QString &binary) { - GnupgBinary *bin;// = lastBinary; + GnupgBinary *bin = lastBinary(); QString executable; qDebug() << "bin:" << binary; |