2 files changed, 10 insertions, 3 deletions

diff --git a/kabc/vcard/VCardEntity.cpp b/kabc/vcard/VCardEntity.cpp
index 0cd2086..5fca3bc 100644
--- a/kabc/vcard/VCardEntity.cpp
+++ b/kabc/vcard/VCardEntity.cpp
@@ -88,35 +88,42 @@ VCardEntity::_parse()
 		QCString cardStr(s.left(i));
 
 		VCard * v = new VCard(cardStr);
 
 		cardList_.append(v);
 
 		v->parse();
 
 		s.remove(0, i);
 	}
 }
 
 	void
 VCardEntity::_assemble()
 {
 	VCardListIterator it(cardList_);
 
 	for (; it.current(); ++it)
 		strRep_ += it.current()->asString() + "\r\n"; // One CRLF for luck.
 }
 
 	VCardList &
 VCardEntity::cardList()
 {
 	parse();
 	return cardList_;
 }
 
 	void
 VCardEntity::setCardList(const VCardList & l)
 {
 	parse();
-	cardList_ = l;
+//US	cardList_ = l;
+    VCardListIterator it(l);
+
+    for (; it.current(); ++it) {
+      VCard* v = new VCard(*it.current());
+      cardList_.append(v);
+    }
+
 }
 
diff --git a/kabc/vcardformatimpl.cpp b/kabc/vcardformatimpl.cpp
index bd9a57b..bffaa64 100644
--- a/kabc/vcardformatimpl.cpp
+++ b/kabc/vcardformatimpl.cpp
@@ -254,66 +254,66 @@ bool VCardFormatImpl::loadAddressee( Addressee& addressee, VCard *v )
         addressee.setAgent( readAgentValue( cl ) );
         break;
 
       case EntitySound:
         addressee.setSound( readSoundValue( cl, addressee ) );
         break;
 
       default:
         kdDebug(5700) << "VCardFormat::load(): Unsupported entity: "
                     << int( type ) << ": " << cl->asString() << endl;
         break;
     }
   }
 
   for( cl = contentLines.first(); cl; cl = contentLines.next() ) {
     EntityType type = cl->entityType();
     if ( type == EntityLabel ) {
       int type = readAddressParam( cl );
       Address address = addressee.address( type );
       if ( address.isEmpty() )
         address.setType( type );
 
       address.setLabel( QString::fromUtf8( cl->value()->asString() ) );
       addressee.insertAddress( address );
     }
   }
 
   return true;
 }
 
 void VCardFormatImpl::saveAddressee( const Addressee &addressee, VCard *v, bool intern )
 {
-  ContentLine cl;
-  QString value;
+//US   ContentLine cl;
+//US  QString value;
 
   addTextValue( v, EntityName, addressee.name() );
   addTextValue( v, EntityUID, addressee.uid() );
   addTextValue( v, EntityFullName, addressee.formattedName() );
 
   QStringList emails = addressee.emails();
   QStringList::ConstIterator it4;
   for( it4 = emails.begin(); it4 != emails.end(); ++it4 ) {
     addTextValue( v, EntityEmail, *it4 );
   }
 
   QStringList customs = addressee.customs();
   QStringList::ConstIterator it5;
   for( it5 = customs.begin(); it5 != customs.end(); ++it5 ) {
     addCustomValue( v, *it5 );
   }
 
   addTextValue( v, EntityURL, addressee.url().url() );
 
   addNValue( v, addressee );
 
   addTextValue( v, EntityNickname, addressee.nickName() );
   addTextValue( v, EntityMailer, addressee.mailer() );
   addTextValue( v, EntityTitle, addressee.title() );
   addTextValue( v, EntityRole, addressee.role() );
   addTextValue( v, EntityOrganisation, addressee.organization() );
   addTextValue( v, EntityNote, addressee.note() );
   addTextValue( v, EntityProductID, addressee.productId() );
   addTextValue( v, EntitySortString, addressee.sortString() );
 
   Address::List addresses = addressee.addresses();
   Address::List::ConstIterator it3;