Add support for GnuPG 2.1

This resolves Bug 2791
Sort keys by name on export
Fix the twice display of the default key server
Signed-off-by: Emanoil Kotsev <deloptes@gmail.com>

Additional formatting adjustments
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

1 files changed, 6 insertions, 1 deletions

diff --git a/kgpg/keyservers.h b/kgpg/keyservers.h
index 4a089f8..51e98a8 100644
--- a/kgpg/keyservers.h
+++ b/kgpg/keyservers.h
@@ -51,6 +51,7 @@ public slots:
 	void slotexportresult(TDEProcess*);
         void slotimportread(KProcIO *p);
         void slotprocread(KProcIO *p);
+	void slotprocresult(TDEProcess *);
         void slotPreExport();
 	void slotExport(TQStringList keyIds);
         void preimport();
@@ -59,13 +60,17 @@ public slots:
         void slotEnableProxyE(bool on);
         void handleQuit();
     	void slotTextChanged( const TQString &text);
+//	void slotksearchprocread(KProcIO *p);
+	void slotksearchprocresult(TDEProcess *);
 
 private:
 
         TQDialog *importpop;
         KSimpleConfig *config;
         uint keyNumbers;
-        TQString readmessage;
+	TQString readmessage, currentKey;;
+	TQStringList keysToImport, invalidKeys;
+	TQMap<TQString,TQStringList> hashMap;
         KProcIO *importproc,*exportproc;
 	KProcIO *searchproc;
         searchRes *listpop;