-rw-r--r-- | kabc/converter/qtopia/qtopiaconverter.cpp | 2 | ||||
-rw-r--r-- | kaddressbook/xxport/opie/opie_xxport.cpp | 11 | ||||
-rw-r--r-- | kaddressbook/xxport/qtopia/qtopia_xxport.cpp | 12 |
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 | |||
@@ -208,3 +208,3 @@ bool QtopiaConverter::qtopiaToAddressee( const PimContact &contact, Addressee &a | |||
208 | //US | 208 | //US |
209 | qDebug("OpieConverter::qtopiaToAddressee found:%s", dt.latin1()); | 209 | // qDebug("QtopiaConverter::qtopiaToAddressee found:%s", dt.latin1()); |
210 | addr.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt); | 210 | addr.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt); |
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 | |||
@@ -186,3 +186,12 @@ KABC::AddresseeList OpieXXPort::importContacts( const QString& ) const | |||
186 | KABC::OpieConverter mConverter; | 186 | KABC::OpieConverter mConverter; |
187 | bool res = false; | 187 | |
188 | bool res = mConverter.init(); | ||
189 | if (!res) | ||
190 | { | ||
191 | QString text( i18n( "Unable to initialize opie converter.<br>Most likely a problem with the category file." ) ); | ||
192 | qDebug(text); | ||
193 | KMessageBox::error( parentWidget(), text ); | ||
194 | delete access; | ||
195 | return KABC::AddresseeList(); | ||
196 | } | ||
188 | 197 | ||
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 | |||
@@ -165,3 +165,13 @@ KABC::AddresseeList QtopiaXXPort::importContacts( const QString& ) const | |||
165 | KABC::QtopiaConverter mConverter; | 165 | KABC::QtopiaConverter mConverter; |
166 | bool res = false; | 166 | |
167 | bool res = mConverter.init(); | ||
168 | if (!res) | ||
169 | { | ||
170 | QString text( i18n( "Unable to initialize qtopia converter.<br>Most likely a problem with the category file." ) ); | ||
171 | qDebug(text); | ||
172 | KMessageBox::error( parentWidget(), text ); | ||
173 | delete access; | ||
174 | return KABC::AddresseeList(); | ||
175 | } | ||
176 | |||
167 | 177 | ||