| -rw-r--r-- | kaddressbook/xxport/vcard_xxport.cpp | 15 |
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 @@ -30,6 +30,7 @@ $Id$ #include <qfile.h> #include <qtextstream.h> +#include <qfileinfo.h> #include <kabc/vcardconverter.h> #include <kabc/vcardparser/vcardtool.h> @@ -146,10 +147,8 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const } else url = XXPortManager::importURL; - if ( url.isEmpty() ) return addrList; - QString caption( i18n( "vCard Import Failed" ) ); if ( KIO::NetAccess::download( url, fileName ) ) { QFile file( fileName ); @@ -181,9 +180,12 @@ 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; - + QFileInfo fi ( fileName ); + if ( !fi.isFile() ) + return addrList; } else { @@ -193,16 +195,13 @@ KABC::AddresseeList VCardXXPort::importContacts( const QString& ) const 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 |