| -rw-r--r-- | bin/kdepim/WhatsNew.txt | 6 | ||||
| -rw-r--r-- | kaddressbook/kaimportoldialog.cpp | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index 0474b0c..89a6d7f 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt @@ -1,8 +1,14 @@ Info about the changes in new versions of KDE-Pim/Pi +********** VERSION 2.1.2 ************ + +Fixed a problem closing the alarm dialog on Zaurus with "OK" button. + +Fixed a problem when importing data from Outlook with mutiple categories set. + ********** VERSION 2.1.1 ************ Stable release 2.1.1! KO/Pi: diff --git a/kaddressbook/kaimportoldialog.cpp b/kaddressbook/kaimportoldialog.cpp index 848d8af..7bb8bd8 100644 --- a/kaddressbook/kaimportoldialog.cpp +++ b/kaddressbook/kaimportoldialog.cpp @@ -310,12 +310,13 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem ) addressee.setSecrecy( sec ); //addressee.setLogo( const Picture &logo ); //addressee.setPhoto( const Picture &photo ); //addressee.setSound( const Sound &sound ); //addressee.setAgent( const Agent &agent ); QString cat = QString::fromUcs2( aItem->GetCategories().GetBuffer()).replace( QRegExp("\\r"), ""); + cat = cat.replace( QRegExp("; "), ";"); addressee.setCategories( QStringList::split( ";", cat )); QString phoneS; phoneS = QString::fromUcs2( aItem->GetAssistantTelephoneNumber().GetBuffer()); if ( ! phoneS.isEmpty()) |