1 files changed, 7 insertions, 8 deletions

diff --git a/kaddressbook/xxport/vcard_xxport.cpp b/kaddressbook/xxport/vcard_xxport.cpp
index acf6419..c56be8b 100644
--- a/kaddressbook/xxport/vcard_xxport.cpp
+++ b/kaddressbook/xxport/vcard_xxport.cpp
@@ -21,24 +21,25 @@
     without including the source code for Qt in the source distribution.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include <qfile.h>
 #include <qtextstream.h>
+#include <qfileinfo.h>
 
 #include <kabc/vcardconverter.h>
 #include <kabc/vcardparser/vcardtool.h>
 #include <kfiledialog.h>
 #ifndef KAB_EMBEDDED
 #include <kio/netaccess.h>
 #endif //KAB_EMBEDDED
 
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <ktempfile.h>
 #include <kurl.h>
@@ -137,28 +138,26 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const
   KURL url;
 
 #ifndef KAB_EMBEDDED
   if ( !XXPortManager::importData.isEmpty() )
     addrList = parseVCard( XXPortManager::importData );
   else {
     if ( XXPortManager::importURL.isEmpty() )
     {
       url = KFileDialog::getLoadFileName( QString::null, i18n("Select vCard to Import"), parentWidget() );
     }
     else
       url = XXPortManager::importURL;
-
     if ( url.isEmpty() )
       return addrList;
-
     QString caption( i18n( "vCard Import Failed" ) );
     if ( KIO::NetAccess::download( url, fileName ) ) {
       QFile file( fileName );
 
       file.open( IO_ReadOnly );
       QByteArray rawData = file.readAll();
       file.close();
 
       QString data = QString::fromUtf8( rawData.data(), rawData.size() + 1 );
       addrList = parseVCard( data );
 
       if ( !url.isLocalFile() )
@@ -172,46 +171,46 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const
   }
 
 
 #else //KAB_EMBEDDED
 
 
   if ( !XXPortManager::importData.isEmpty() )
     addrList = parseVCard( XXPortManager::importData );
   else {
     if ( XXPortManager::importURL.isEmpty() )
     {
       fileName = KFileDialog::getOpenFileName( QString::null, i18n("Select vCard to Import"), parentWidget() );
+
       if ( fileName.isEmpty() )
         return addrList;
-
+                QFileInfo fi ( fileName );
+                if ( !fi.isFile() )
+                    return addrList;
     }
     else
     {
 //US      url = XXPortManager::importURL;
       qDebug("VCardXXPort::importContacts  Urls at the moment not supported");
       if ( url.isEmpty() )
         return addrList;
 
     }
-
-
       QFile file( fileName );
-
-      file.open( IO_ReadOnly );
+        if ( file.open( IO_ReadOnly ) ) {
       QByteArray rawData = file.readAll();
       file.close();
-
       QString data = QString::fromUtf8( rawData.data(), rawData.size() + 1 );
       addrList = parseVCard( data );
+        }
 
   }
 #endif //KAB_EMBEDDED
 
   return addrList;
 }
 
 KABC::AddresseeList VCardXXPort::parseVCard( const QString &data ) const
 {
 
   KABC::VCardTool tool;
   KABC::AddresseeList addrList;