author | ulf69 <ulf69> | 2004-07-15 15:15:52 (UTC) |
---|---|---|
committer | ulf69 <ulf69> | 2004-07-15 15:15:52 (UTC) |
commit | ec8315212b05c128c8d5650cf5daff2b1d6b84dd (patch) (side-by-side diff) | |
tree | ae4ffd799c19caa18c1b0964783f915395769a24 /kaddressbook | |
parent | 59f727076930aada485db6531d4084f2bfe0b928 (diff) | |
download | kdepimpi-ec8315212b05c128c8d5650cf5daff2b1d6b84dd.zip kdepimpi-ec8315212b05c128c8d5650cf5daff2b1d6b84dd.tar.gz kdepimpi-ec8315212b05c128c8d5650cf5daff2b1d6b84dd.tar.bz2 |
resolved crash during import of opie and qtopia addressbooks
-rw-r--r-- | kaddressbook/xxport/opie/opie_xxport.cpp | 11 | ||||
-rw-r--r-- | kaddressbook/xxport/qtopia/qtopia_xxport.cpp | 12 |
2 files changed, 21 insertions, 2 deletions
diff --git a/kaddressbook/xxport/opie/opie_xxport.cpp b/kaddressbook/xxport/opie/opie_xxport.cpp index 12c83af..db30d34 100644 --- a/kaddressbook/xxport/opie/opie_xxport.cpp +++ b/kaddressbook/xxport/opie/opie_xxport.cpp @@ -179,17 +179,26 @@ KABC::AddresseeList OpieXXPort::importContacts( const QString& ) const qDebug("Unable to access file() %s", fileName.latin1()); addressBook()->error( i18n( "Unable to access file '%1'." ).arg( fileName ) ); return KABC::AddresseeList(); } access -> setReadAhead( 32 ); // Use ReadAhead-Cache if available KABC::OpieConverter mConverter; - bool res = false; + + bool res = mConverter.init(); + if (!res) + { + QString text( i18n( "Unable to initialize opie converter.<br>Most likely a problem with the category file." ) ); + qDebug(text); + KMessageBox::error( parentWidget(), text ); + delete access; + return KABC::AddresseeList(); + } OContactAccess::List::Iterator it; OContactAccess::List allList = access->allRecords(); for ( it = allList.begin(); it != allList.end(); ++it ) { OContact c = (*it); diff --git a/kaddressbook/xxport/qtopia/qtopia_xxport.cpp b/kaddressbook/xxport/qtopia/qtopia_xxport.cpp index 3d830df..bf39fdb 100644 --- a/kaddressbook/xxport/qtopia/qtopia_xxport.cpp +++ b/kaddressbook/xxport/qtopia/qtopia_xxport.cpp @@ -158,17 +158,27 @@ KABC::AddresseeList QtopiaXXPort::importContacts( const QString& ) const QString text( i18n( "Unable to access file '%1'." ).arg( fileName ) ); qDebug(text.latin1()); addressBook()->error( text ); KMessageBox::error( parentWidget(), text ); return KABC::AddresseeList(); } KABC::QtopiaConverter mConverter; - bool res = false; + + bool res = mConverter.init(); + if (!res) + { + QString text( i18n( "Unable to initialize qtopia converter.<br>Most likely a problem with the category file." ) ); + qDebug(text); + KMessageBox::error( parentWidget(), text ); + delete access; + return KABC::AddresseeList(); + } + { //create a new scope AddressBookIterator it(*access); for (it.toFirst(); it.current(); ++it) { const PimContact*contact = it.current(); |