summaryrefslogtreecommitdiff
path: root/libopie2/opiepim
Unidiff
Diffstat (limited to 'libopie2/opiepim') (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp
index 0ffbb67..5bc2755 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp
@@ -456,67 +456,67 @@ VObject* OPimContactAccessBackend_VCard::createVObject( const OPimContact &c )
456 && c.homeCity().isEmpty() 456 && c.homeCity().isEmpty()
457 && c.homeState().isEmpty() 457 && c.homeState().isEmpty()
458 && c.homeZip().isEmpty() 458 && c.homeZip().isEmpty()
459 && c.homeCountry().isEmpty() ) ){ 459 && c.homeCountry().isEmpty() ) ){
460 VObject *home_adr= safeAddProp( vcard, VCAdrProp ); 460 VObject *home_adr= safeAddProp( vcard, VCAdrProp );
461 safeAddProp( home_adr, VCHomeProp ); 461 safeAddProp( home_adr, VCHomeProp );
462 safeAddPropValue( home_adr, VCStreetAddressProp, c.homeStreet() ); 462 safeAddPropValue( home_adr, VCStreetAddressProp, c.homeStreet() );
463 safeAddPropValue( home_adr, VCCityProp, c.homeCity() ); 463 safeAddPropValue( home_adr, VCCityProp, c.homeCity() );
464 safeAddPropValue( home_adr, VCRegionProp, c.homeState() ); 464 safeAddPropValue( home_adr, VCRegionProp, c.homeState() );
465 safeAddPropValue( home_adr, VCPostalCodeProp, c.homeZip() ); 465 safeAddPropValue( home_adr, VCPostalCodeProp, c.homeZip() );
466 safeAddPropValue( home_adr, VCCountryNameProp, c.homeCountry() ); 466 safeAddPropValue( home_adr, VCCountryNameProp, c.homeCountry() );
467 } 467 }
468 468
469 VObject *home_phone = safeAddPropValue( vcard, VCTelephoneProp, c.homePhone() ); 469 VObject *home_phone = safeAddPropValue( vcard, VCTelephoneProp, c.homePhone() );
470 safeAddProp( home_phone, VCHomeProp ); 470 safeAddProp( home_phone, VCHomeProp );
471 home_phone = safeAddPropValue( vcard, VCTelephoneProp, c.homeMobile() ); 471 home_phone = safeAddPropValue( vcard, VCTelephoneProp, c.homeMobile() );
472 safeAddProp( home_phone, VCHomeProp );
473 safeAddProp( home_phone, VCCellularProp ); 472 safeAddProp( home_phone, VCCellularProp );
474 home_phone = safeAddPropValue( vcard, VCTelephoneProp, c.homeFax() );
475 safeAddProp( home_phone, VCHomeProp ); 473 safeAddProp( home_phone, VCHomeProp );
474 home_phone = safeAddPropValue( vcard, VCTelephoneProp, c.homeFax() );
476 safeAddProp( home_phone, VCFaxProp ); 475 safeAddProp( home_phone, VCFaxProp );
476 safeAddProp( home_phone, VCHomeProp );
477 477
478 VObject *url = safeAddPropValue( vcard, VCURLProp, c.homeWebpage() ); 478 VObject *url = safeAddPropValue( vcard, VCURLProp, c.homeWebpage() );
479 safeAddProp( url, VCHomeProp ); 479 safeAddProp( url, VCHomeProp );
480 480
481 // work properties 481 // work properties
482 if ( !( c.businessStreet().isEmpty() 482 if ( !( c.businessStreet().isEmpty()
483 && c.businessCity().isEmpty() 483 && c.businessCity().isEmpty()
484 && c.businessState().isEmpty() 484 && c.businessState().isEmpty()
485 && c.businessZip().isEmpty() 485 && c.businessZip().isEmpty()
486 && c.businessCountry().isEmpty() ) ){ 486 && c.businessCountry().isEmpty() ) ){
487 VObject *work_adr= safeAddProp( vcard, VCAdrProp ); 487 VObject *work_adr= safeAddProp( vcard, VCAdrProp );
488 safeAddProp( work_adr, VCWorkProp ); 488 safeAddProp( work_adr, VCWorkProp );
489 safeAddPropValue( work_adr, VCStreetAddressProp, c.businessStreet() ); 489 safeAddPropValue( work_adr, VCStreetAddressProp, c.businessStreet() );
490 safeAddPropValue( work_adr, VCCityProp, c.businessCity() ); 490 safeAddPropValue( work_adr, VCCityProp, c.businessCity() );
491 safeAddPropValue( work_adr, VCRegionProp, c.businessState() ); 491 safeAddPropValue( work_adr, VCRegionProp, c.businessState() );
492 safeAddPropValue( work_adr, VCPostalCodeProp, c.businessZip() ); 492 safeAddPropValue( work_adr, VCPostalCodeProp, c.businessZip() );
493 safeAddPropValue( work_adr, VCCountryNameProp, c.businessCountry() ); 493 safeAddPropValue( work_adr, VCCountryNameProp, c.businessCountry() );
494 } 494 }
495 495
496 VObject *work_phone = safeAddPropValue( vcard, VCTelephoneProp, c.businessPhone() ); 496 VObject *work_phone = safeAddPropValue( vcard, VCTelephoneProp, c.businessPhone() );
497 safeAddProp( work_phone, VCWorkProp ); 497 safeAddProp( work_phone, VCWorkProp );
498 work_phone = safeAddPropValue( vcard, VCTelephoneProp, c.businessMobile() ); 498 work_phone = safeAddPropValue( vcard, VCTelephoneProp, c.businessMobile() );
499 safeAddProp( work_phone, VCWorkProp );
500 safeAddProp( work_phone, VCCellularProp ); 499 safeAddProp( work_phone, VCCellularProp );
501 work_phone = safeAddPropValue( vcard, VCTelephoneProp, c.businessFax() );
502 safeAddProp( work_phone, VCWorkProp ); 500 safeAddProp( work_phone, VCWorkProp );
501 work_phone = safeAddPropValue( vcard, VCTelephoneProp, c.businessFax() );
503 safeAddProp( work_phone, VCFaxProp ); 502 safeAddProp( work_phone, VCFaxProp );
504 work_phone = safeAddPropValue( vcard, VCTelephoneProp, c.businessPager() );
505 safeAddProp( work_phone, VCWorkProp ); 503 safeAddProp( work_phone, VCWorkProp );
504 work_phone = safeAddPropValue( vcard, VCTelephoneProp, c.businessPager() );
506 safeAddProp( work_phone, VCPagerProp ); 505 safeAddProp( work_phone, VCPagerProp );
506 safeAddProp( work_phone, VCWorkProp );
507 507
508 url = safeAddPropValue( vcard, VCURLProp, c.businessWebpage() ); 508 url = safeAddPropValue( vcard, VCURLProp, c.businessWebpage() );
509 safeAddProp( url, VCWorkProp ); 509 safeAddProp( url, VCWorkProp );
510 510
511 VObject *title = safeAddPropValue( vcard, VCTitleProp, c.jobTitle() ); 511 VObject *title = safeAddPropValue( vcard, VCTitleProp, c.jobTitle() );
512 safeAddProp( title, VCWorkProp ); 512 safeAddProp( title, VCWorkProp );
513 513
514 514
515 QStringList emails = c.emailList(); 515 QStringList emails = c.emailList();
516 // emails.prepend( c.defaultEmail() ); Fix for bugreport #1045 516 // emails.prepend( c.defaultEmail() ); Fix for bugreport #1045
517 for( QStringList::Iterator it = emails.begin(); it != emails.end(); ++it ) { 517 for( QStringList::Iterator it = emails.begin(); it != emails.end(); ++it ) {
518 VObject *email = safeAddPropValue( vcard, VCEmailAddressProp, *it ); 518 VObject *email = safeAddPropValue( vcard, VCEmailAddressProp, *it );
519 safeAddProp( email, VCInternetProp ); 519 safeAddProp( email, VCInternetProp );
520 } 520 }
521 521
522 safeAddPropValue( vcard, VCNoteProp, c.notes() ); 522 safeAddPropValue( vcard, VCNoteProp, c.notes() );