From 2dd1a65017747a47cda58f2f5b61b4e5f82b9f6d Mon Sep 17 00:00:00 2001
From: Christian Hohnstaedt <chris@tweety.localdomain>
Date: Tue, 21 Nov 2006 18:11:49 +0100
Subject: [PATCH] Fix import multi

---
 lib/db_base.cpp   |  1 -
 lib/db_x509.cpp   |  2 ++
 ui/ImportMulti.ui | 19 ++++++++++++++++++-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/lib/db_base.cpp b/lib/db_base.cpp
index da3851a7..215d9300 100644
--- a/lib/db_base.cpp
+++ b/lib/db_base.cpp
@@ -296,7 +296,6 @@ void db_base::inToCont(pki_base *pki)
 
 pki_base *db_base::getByName(QString desc)
 {
-	if (desc == "" ) return NULL;
 	FOR_ALL_pki(pki, pki_base) {
 		if (pki->getIntName() == desc)
 			return pki;
diff --git a/lib/db_x509.cpp b/lib/db_x509.cpp
index 548a1a62..efb3290a 100644
--- a/lib/db_x509.cpp
+++ b/lib/db_x509.cpp
@@ -390,6 +390,8 @@ void db_x509::newCert(NewX509 *dlg)
 	// Step 1 - Subject and key
 	if (!dlg->fromReqCB->isChecked()) {
 	    clientkey = dlg->getSelectedKey();
+		if (!clientkey)
+			return;
 	    subject = dlg->getX509name();
 	    intname = dlg->description->text();
 	}
diff --git a/ui/ImportMulti.ui b/ui/ImportMulti.ui
index 22dc9dfe..fb98b58f 100644
--- a/ui/ImportMulti.ui
+++ b/ui/ImportMulti.ui
@@ -111,5 +111,22 @@
  </widget>
  <pixmapfunction></pixmapfunction>
  <resources/>
- <connections/>
+ <connections>
+  <connection>
+   <sender>butCancel</sender>
+   <signal>clicked()</signal>
+   <receiver>ImportMulti</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>373</x>
+     <y>131</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>287</x>
+     <y>358</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>