aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/GpgFrontend.h.in2
-rw-r--r--include/gpg/GpgContext.h2
-rw-r--r--include/ui/KeyUploadDialog.h6
3 files changed, 9 insertions, 1 deletions
diff --git a/include/GpgFrontend.h.in b/include/GpgFrontend.h.in
index 3c3e72cc..de88bab2 100644
--- a/include/GpgFrontend.h.in
+++ b/include/GpgFrontend.h.in
@@ -41,6 +41,8 @@
#if OS_PLATFORM == MACOS && BUILD_FLAG == RELEASE
# define RESOURCE_DIR(appDir) (appDir + "/../Resources/")
+#elif OS_PLATFORM == LINUX && BUILD_FLAG == RELEASE
+# define RESOURCE_DIR(appDir) (appDir + "/../share/")
#else
# define RESOURCE_DIR(appDir) (appDir)
#endif
diff --git a/include/gpg/GpgContext.h b/include/gpg/GpgContext.h
index 1e5334d1..e243cc53 100644
--- a/include/gpg/GpgContext.h
+++ b/include/gpg/GpgContext.h
@@ -99,7 +99,7 @@ namespace GpgME {
void clearPasswordCache();
- void exportSecretKey(const QString &uid, QByteArray *outBuffer);
+ bool exportSecretKey(const GpgKey &key, QByteArray *outBuffer);
void getSigners(QVector<GpgKey> &signer);
diff --git a/include/ui/KeyUploadDialog.h b/include/ui/KeyUploadDialog.h
index 013c0b72..b41ced6b 100644
--- a/include/ui/KeyUploadDialog.h
+++ b/include/ui/KeyUploadDialog.h
@@ -33,6 +33,10 @@ Q_OBJECT
public:
KeyUploadDialog(GpgME::GpgContext *ctx, const QVector<GpgKey> &keys, QWidget *parent = nullptr);
+public slots:
+
+ void slotUpload();
+
private slots:
void uploadKeyToServer(QByteArray &keys);
@@ -41,6 +45,8 @@ private slots:
private:
+ GpgME::GpgContext *mCtx;
+ const QVector<GpgKey> &mKeys;
QString appPath;
QSettings settings;
QByteArray mKeyData;