1 files changed, 12 insertions, 4 deletions

diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp
index 54d0cbd..b53f873 100644
--- a/kaddressbook/xxport/vcard_xxport.cpp
+++ b/kaddressbook/xxport/vcard_xxport.cpp
@@ -33,4 +33,5 @@ $Id$
 
 #include <kabc/vcardconverter.h>
+#include <kabc/vcardparser/vcardtool.h>
 #include <kfiledialog.h>
 #ifndef KAB_EMBEDDED
@@ -210,8 +211,11 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const
 
 KABC::AddresseeList VCardXXPort::parseVCard( const QString &data ) const
-{
-  KABC::VCardConverter converter;
+{ 
+   
+  KABC::VCardTool tool;
   KABC::AddresseeList addrList;
-
+  addrList = tool.parseVCards( data );
+  // LR : I switched to the code, which is in current cvs HEAD
+  /*
   uint numVCards = data.contains( "BEGIN:VCARD", false );
   QStringList dataList = QStringList::split( "\r\n\r\n", data );
@@ -238,5 +242,9 @@ KABC::AddresseeList VCardXXPort::parseVCard( const QString &data ) const
     }
   }
-
+  */
+  if ( addrList.isEmpty()  ) {
+      QString text = i18n( "The selected file does not\ninclude a valid vCard.\nPlease check the file and try again.\n" );
+      KMessageBox::sorry( parentWidget(), text );
+  }
   return addrList;
 }