summaryrefslogtreecommitdiff
authoreilers <eilers>2005-02-03 10:05:00 (UTC)
committer eilers <eilers>2005-02-03 10:05:00 (UTC)
commit9424f9fa34e458c90b5f9bbe2a88074cd9a1161c (patch) (side-by-side diff)
treea4d94b096a82f49e8b6d4766cc4cae3763350d19
parent2ed3b823bdcb473dca8a809b939c5d7d282b70bb (diff)
downloadopie-9424f9fa34e458c90b5f9bbe2a88074cd9a1161c.zip
opie-9424f9fa34e458c90b5f9bbe2a88074cd9a1161c.tar.gz
opie-9424f9fa34e458c90b5f9bbe2a88074cd9a1161c.tar.bz2
Fixing bug #1236: VCARD contained empty WORK and HOME addressfields..
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp
index f3b6d56..0ffbb67 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp
@@ -454,2 +454,7 @@ VObject* OPimContactAccessBackend_VCard::createVObject( const OPimContact &c )
// home properties
+ if ( !( c.homeStreet().isEmpty()
+ && c.homeCity().isEmpty()
+ && c.homeState().isEmpty()
+ && c.homeZip().isEmpty()
+ && c.homeCountry().isEmpty() ) ){
VObject *home_adr= safeAddProp( vcard, VCAdrProp );
@@ -461,2 +466,3 @@ VObject* OPimContactAccessBackend_VCard::createVObject( const OPimContact &c )
safeAddPropValue( home_adr, VCCountryNameProp, c.homeCountry() );
+ }
@@ -475,2 +481,7 @@ VObject* OPimContactAccessBackend_VCard::createVObject( const OPimContact &c )
// work properties
+ if ( !( c.businessStreet().isEmpty()
+ && c.businessCity().isEmpty()
+ && c.businessState().isEmpty()
+ && c.businessZip().isEmpty()
+ && c.businessCountry().isEmpty() ) ){
VObject *work_adr= safeAddProp( vcard, VCAdrProp );
@@ -482,2 +493,3 @@ VObject* OPimContactAccessBackend_VCard::createVObject( const OPimContact &c )
safeAddPropValue( work_adr, VCCountryNameProp, c.businessCountry() );
+ }