summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-04-19 15:19:29 (UTC)
committer zautrix <zautrix>2005-04-19 15:19:29 (UTC)
commitb36bdf88fbf3cc78e4bf072b5eb3ec16bd8ec235 (patch) (unidiff)
treec1d6a10633c0b57f68c6d5e10e1f427b96dee0c5
parentda4130c979ec1ea278183ef7697777cb4d1f5101 (diff)
downloadkdepimpi-b36bdf88fbf3cc78e4bf072b5eb3ec16bd8ec235.zip
kdepimpi-b36bdf88fbf3cc78e4bf072b5eb3ec16bd8ec235.tar.gz
kdepimpi-b36bdf88fbf3cc78e4bf072b5eb3ec16bd8ec235.tar.bz2
fix
Diffstat (more/less context) (show 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,14 +1,20 @@
1Info about the changes in new versions of KDE-Pim/Pi 1Info 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
4********** VERSION 2.1.1 ************ 10********** VERSION 2.1.1 ************
5 11
6Stable release 2.1.1! 12Stable release 2.1.1!
7 13
8KO/Pi: 14KO/Pi:
9Fixed one problem in the layout of the edit dialogs on the Zaurus with 640x480 display. 15Fixed one problem in the layout of the edit dialogs on the Zaurus with 640x480 display.
10 16
11********** VERSION 2.1.0 ************ 17********** VERSION 2.1.0 ************
12 18
13Stable release 2.1.0! 19Stable release 2.1.0!
14 20
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 )
304 QString dt = KGlobal::locale()->formatDate( dtb.date() , true, KLocale::ISODate); 304 QString dt = KGlobal::locale()->formatDate( dtb.date() , true, KLocale::ISODate);
305 addressee.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt); 305 addressee.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt);
306 } 306 }
307 int sec = aItem->GetSensitivity() ; 307 int sec = aItem->GetSensitivity() ;
308 if ( sec > 1 )// mapping pers -> private 308 if ( sec > 1 )// mapping pers -> private
309 --sec; 309 --sec;
310 addressee.setSecrecy( sec ); 310 addressee.setSecrecy( sec );
311 //addressee.setLogo( const Picture &logo ); 311 //addressee.setLogo( const Picture &logo );
312 //addressee.setPhoto( const Picture &photo ); 312 //addressee.setPhoto( const Picture &photo );
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;
319 320
320 phoneS = QString::fromUcs2( aItem->GetAssistantTelephoneNumber().GetBuffer()); 321 phoneS = QString::fromUcs2( aItem->GetAssistantTelephoneNumber().GetBuffer());
321 if ( ! phoneS.isEmpty()) 322 if ( ! phoneS.isEmpty())
322 addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Work + KABC::PhoneNumber::Voice ) ); 323 addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Work + KABC::PhoneNumber::Voice ) );
323 phoneS = QString::fromUcs2( aItem->GetBusinessTelephoneNumber().GetBuffer()); 324 phoneS = QString::fromUcs2( aItem->GetBusinessTelephoneNumber().GetBuffer());
324 if ( ! phoneS.isEmpty()) 325 if ( ! phoneS.isEmpty())
325 addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Work ) ); 326 addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Work ) );
326 phoneS = QString::fromUcs2( aItem->GetBusiness2TelephoneNumber().GetBuffer()); 327 phoneS = QString::fromUcs2( aItem->GetBusiness2TelephoneNumber().GetBuffer());
327 if ( ! phoneS.isEmpty()) 328 if ( ! phoneS.isEmpty())