author | zautrix <zautrix> | 2005-04-19 15:19:29 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-04-19 15:19:29 (UTC) |
commit | b36bdf88fbf3cc78e4bf072b5eb3ec16bd8ec235 (patch) (unidiff) | |
tree | c1d6a10633c0b57f68c6d5e10e1f427b96dee0c5 | |
parent | da4130c979ec1ea278183ef7697777cb4d1f5101 (diff) | |
download | kdepimpi-b36bdf88fbf3cc78e4bf072b5eb3ec16bd8ec235.zip kdepimpi-b36bdf88fbf3cc78e4bf072b5eb3ec16bd8ec235.tar.gz kdepimpi-b36bdf88fbf3cc78e4bf072b5eb3ec16bd8ec235.tar.bz2 |
fix
-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,5 +1,11 @@ | |||
1 | Info about the changes in new versions of KDE-Pim/Pi | 1 | Info about the changes in new versions of KDE-Pim/Pi |
2 | 2 | ||
3 | ********** VERSION 2.1.2 ************ | ||
4 | |||
5 | Fixed a problem closing the alarm dialog on Zaurus with "OK" button. | ||
6 | |||
7 | Fixed a problem when importing data from Outlook with mutiple categories set. | ||
8 | |||
3 | 9 | ||
4 | ********** VERSION 2.1.1 ************ | 10 | ********** VERSION 2.1.1 ************ |
5 | 11 | ||
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 ) | |||
313 | //addressee.setSound( const Sound &sound ); | 313 | //addressee.setSound( const Sound &sound ); |
314 | //addressee.setAgent( const Agent &agent ); | 314 | //addressee.setAgent( const Agent &agent ); |
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 )); |
317 | 318 | ||
318 | QString phoneS; | 319 | QString phoneS; |