From c4bd138c16e8d34294502c9da5706e21337ba53d Mon Sep 17 00:00:00 2001
From: ulf69 <ulf69>
Date: Tue, 06 Jul 2004 04:04:56 +0000
Subject: ok button of dialog works now. import of vcards works now, export of opie resources too.

---
(limited to 'kaddressbook/xxport')

diff --git a/kaddressbook/xxport/opie/opie_xxport.cpp b/kaddressbook/xxport/opie/opie_xxport.cpp
index f30a205..d1def18 100644
--- a/kaddressbook/xxport/opie/opie_xxport.cpp
+++ b/kaddressbook/xxport/opie/opie_xxport.cpp
@@ -142,7 +142,7 @@ bool OpieXXPort::exportContacts( const KABC::AddresseeList &list, const QString
   access->save();
 
   delete access;
-  delete backend;
+//US the deletion of the access object deletes the backend object as well.
       
   return true;
 }
@@ -195,7 +195,7 @@ KABC::AddresseeList OpieXXPort::importContacts( const QString& ) const
   }
   
   delete access;
-  delete backend;
+//US the deletion of the access object deletes the backend object as well.
   
   return adrlst;
   
diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp
index c017f5b..54d0cbd 100644
--- a/kaddressbook/xxport/vcard_xxport.cpp
+++ b/kaddressbook/xxport/vcard_xxport.cpp
@@ -179,15 +179,19 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const
     if ( XXPortManager::importURL.isEmpty() )
     {
       fileName = KFileDialog::getOpenFileName( QString::null, i18n("Select vCard to Import"), parentWidget() );
+      if ( fileName.isEmpty() )
+        return addrList;
+    
     }
     else
     {
 //US      url = XXPortManager::importURL;
       qDebug("VCardXXPort::importContacts  Urls at the moment not supported");
+      if ( url.isEmpty() )
+        return addrList;
+    
     }
 
-    if ( url.isEmpty() )
-      return addrList;
       
       QFile file( fileName );
 
--
cgit v0.9.0.2