summaryrefslogtreecommitdiffabout
authorulf69 <ulf69>2004-07-15 15:15:52 (UTC)
committer ulf69 <ulf69>2004-07-15 15:15:52 (UTC)
commitec8315212b05c128c8d5650cf5daff2b1d6b84dd (patch) (side-by-side diff)
treeae4ffd799c19caa18c1b0964783f915395769a24
parent59f727076930aada485db6531d4084f2bfe0b928 (diff)
downloadkdepimpi-ec8315212b05c128c8d5650cf5daff2b1d6b84dd.zip
kdepimpi-ec8315212b05c128c8d5650cf5daff2b1d6b84dd.tar.gz
kdepimpi-ec8315212b05c128c8d5650cf5daff2b1d6b84dd.tar.bz2
resolved crash during import of opie and qtopia addressbooks
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--kabc/converter/qtopia/qtopiaconverter.cpp2
-rw-r--r--kaddressbook/xxport/opie/opie_xxport.cpp11
-rw-r--r--kaddressbook/xxport/qtopia/qtopia_xxport.cpp12
3 files changed, 22 insertions, 3 deletions
diff --git a/kabc/converter/qtopia/qtopiaconverter.cpp b/kabc/converter/qtopia/qtopiaconverter.cpp
index f451b8b..498e89e 100644
--- a/kabc/converter/qtopia/qtopiaconverter.cpp
+++ b/kabc/converter/qtopia/qtopiaconverter.cpp
@@ -205,9 +205,9 @@ bool QtopiaConverter::qtopiaToAddressee( const PimContact &contact, Addressee &a
if (contact.anniversary().isValid()) {
QString dt = KGlobal::locale()->formatDate(contact.anniversary(), true, KLocale::ISODate);
//US
- qDebug("OpieConverter::qtopiaToAddressee found:%s", dt.latin1());
+// qDebug("QtopiaConverter::qtopiaToAddressee found:%s", dt.latin1());
addr.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt);
}
addr.insertCustom( "KADDRESSBOOK", "X-Children", contact.children() );
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
@@ -183,9 +183,18 @@ KABC::AddresseeList OpieXXPort::importContacts( const QString& ) const
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();
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
@@ -162,9 +162,19 @@ KABC::AddresseeList QtopiaXXPort::importContacts( const QString& ) const
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);