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,14 +1,20 @@
 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:
 Fixed one problem in the layout of the edit dialogs on the Zaurus with 640x480 display.
 
 ********** VERSION 2.1.0 ************
 
 Stable release 2.1.0!
 
diff --git a/kaddressbook/kaimportoldialog.cpp b/kaddressbook/kaimportoldialog.cpp
index 848d8af..7bb8bd8 100644
--- a/kaddressbook/kaimportoldialog.cpp
+++ b/kaddressbook/kaimportoldialog.cpp
@@ -304,24 +304,25 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
     QString dt = KGlobal::locale()->formatDate( dtb.date() , true, KLocale::ISODate);
     addressee.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt);
   }
   int sec =   aItem->GetSensitivity() ;
   if ( sec > 1 )// mapping pers -> private
     --sec;
   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()) 
     addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Work + KABC::PhoneNumber::Voice ) );
   phoneS = QString::fromUcs2( aItem->GetBusinessTelephoneNumber().GetBuffer());
   if ( ! phoneS.isEmpty()) 
     addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Work ) );
   phoneS = QString::fromUcs2( aItem->GetBusiness2TelephoneNumber().GetBuffer());
   if ( ! phoneS.isEmpty())