summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt6
-rw-r--r--kaddressbook/kaimportoldialog.cpp1
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
@@ -2,2 +2,8 @@ Info about the changes in new versions of KDE-Pim/Pi
2 2
3********** VERSION 2.1.2 ************
4
5Fixed a problem closing the alarm dialog on Zaurus with "OK" button.
6
7Fixed a problem when importing data from Outlook with mutiple categories set.
8
3 9
diff --git a/kaddressbook/kaimportoldialog.cpp b/kaddressbook/kaimportoldialog.cpp
index 848d8af..7bb8bd8 100644
--- a/kaddressbook/kaimportoldialog.cpp
+++ b/kaddressbook/kaimportoldialog.cpp
@@ -315,2 +315,3 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
315 QString cat = QString::fromUcs2( aItem->GetCategories().GetBuffer()).replace( QRegExp("\\r"), ""); 315 QString cat = QString::fromUcs2( aItem->GetCategories().GetBuffer()).replace( QRegExp("\\r"), "");
316 cat = cat.replace( QRegExp("; "), ";");
316 addressee.setCategories( QStringList::split( ";", cat )); 317 addressee.setCategories( QStringList::split( ";", cat ));