From b9521c2263aaf40eb163b548ce99df8608394362 Mon Sep 17 00:00:00 2001
From: ubbo <ubbo@34ebc366-c3a9-4b3c-9f84-69acf7962910>
Date: Wed, 18 Jan 2012 22:08:30 +0000
Subject: import private and public keys with one import-method call

git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@754 34ebc366-c3a9-4b3c-9f84-69acf7962910
---
 wizard.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/wizard.cpp b/wizard.cpp
index 18d8a07..a4ee5c8 100644
--- a/wizard.cpp
+++ b/wizard.cpp
@@ -233,8 +233,6 @@ bool ImportFromGnupgPage::importKeysFromGnupg()
         return false;
     }
     QByteArray inBuffer = file.readAll();
-    mKeyMgmt->importKeys(inBuffer);
-    inBuffer.clear();
     file.close();
 
     // try to import public keys
@@ -244,7 +242,7 @@ bool ImportFromGnupgPage::importKeysFromGnupg()
         QMessageBox::critical(0, tr("Import error"), tr("Couldn't open public keyringfile: ") + pubRingFile);
         return false;
     }
-    inBuffer = file.readAll();
+    inBuffer.append(file.readAll());
     mKeyMgmt->importKeys(inBuffer);
     inBuffer.clear();
     file.close();
-- 
cgit v1.2.3