summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-04-19 15:19:29 (UTC)
committer zautrix <zautrix>2005-04-19 15:19:29 (UTC)
commitb36bdf88fbf3cc78e4bf072b5eb3ec16bd8ec235 (patch) (side-by-side diff)
treec1d6a10633c0b57f68c6d5e10e1f427b96dee0c5
parentda4130c979ec1ea278183ef7697777cb4d1f5101 (diff)
downloadkdepimpi-b36bdf88fbf3cc78e4bf072b5eb3ec16bd8ec235.zip
kdepimpi-b36bdf88fbf3cc78e4bf072b5eb3ec16bd8ec235.tar.gz
kdepimpi-b36bdf88fbf3cc78e4bf072b5eb3ec16bd8ec235.tar.bz2
fix
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
@@ -1,5 +1,11 @@
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 ************
diff --git a/kaddressbook/kaimportoldialog.cpp b/kaddressbook/kaimportoldialog.cpp
index 848d8af..7bb8bd8 100644
--- a/kaddressbook/kaimportoldialog.cpp
+++ b/kaddressbook/kaimportoldialog.cpp
@@ -313,6 +313,7 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
//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;