resolved crash during import of opie and qtopia addressbooks

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
@@ -139,74 +139,83 @@ bool OpieXXPort::exportContacts( const KABC::AddresseeList &list, const QString
     res = mConverter.addresseeToOpie( *it, c );
     if (res == true)
     {
       res = access->add(c);
       if (res == false)
         qDebug("Unable to append Contact %s", c.fullName().latin1());
     }
     else
     {
       qDebug("Unable to convert Addressee %s", addressee.formattedName().latin1());
     }
   }
   
   access->save();
 
   delete access;
 //US the deletion of the access object deletes the backend object as well.
       
   return true;
 }
 
 KABC::AddresseeList OpieXXPort::importContacts( const QString& ) const
 {
   KABC::AddresseeList adrlst;
   
   QString name = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml";
     
 #ifndef KAB_EMBEDDED
   QString fileName = KFileDialog::getOpenFileName( name );
 #else //KAB_EMBEDDED
   QString fileName = KFileDialog::getOpenFileName( name, i18n("Load file"), parentWidget() );
 #endif //KAB_EMBEDDED
   
   if ( fileName.isEmpty() )
     return KABC::AddresseeList();
 
   OContactAccessBackend_XML* backend = new OContactAccessBackend_XML( "KA/Pi", fileName );
   OContactAccess* access = new OContactAccess("KA/Pi", 0l, backend, false);
         
   if ( !access ) {
     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);
     
     KABC::Addressee addressee;
     
     res = mConverter.opieToAddressee( c, addressee );    
     
     if ( !addressee.isEmpty() && res ) {
       adrlst.append( addressee );
     }
     
 //    qDebug("found %s", c.fullName().latin1());
   }
   
   delete access;
 //US the deletion of the access object deletes the backend object as well.
   
   return adrlst;
   
 }
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
@@ -118,74 +118,84 @@ bool QtopiaXXPort::exportContacts( const KABC::AddresseeList &list, const QStrin
     if (firstcontact)
     {
       QString text( i18n( "Do you want to remove<br>all existing entries from<br>%1<br>before exporting.?" ) );
       if ( KMessageBox::questionYesNo( parentWidget(), text.arg( fileName ) ) == KMessageBox::Yes ) {
         // Clean the database..
 
         AddressBookIterator it2(*access);
         for (it2.toFirst(); it2.current(); ++it2) {
           access->removeContact(*it2.current());
         }
       }
     }
   }
       
   KABC::Addressee::List::ConstIterator it;
   for ( it = list.begin(); it != list.end(); ++it ) {
     PimContact c;
     KABC::Addressee addressee = (*it);
     
     res = mConverter.addresseeToQtopia( *it, c );
     if (res == true)
     {
       access->addContact(c);
     }
   }
   
   delete access;
       
   return true;
 }
 
 KABC::AddresseeList QtopiaXXPort::importContacts( const QString& ) const
 {
   KABC::AddresseeList adrlst;
   
   QString fileName = QDir::homeDirPath() + "/Applications/addressbook/addressbook.xml";
 
   AddressBookAccess* access = new AddressBookAccess();
         
   if ( !access ) {
     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();
     
       KABC::Addressee addressee;
     
       res = mConverter.qtopiaToAddressee( (*contact), addressee );    
     
       if ( !addressee.isEmpty() && res )
       {
         adrlst.append( addressee );
       }
     }
   }
   
   delete access;
 //US the deletion of the access object deletes the backend object as well.
   
   return adrlst;
   
 }