From 6c715b67a8f0e32a4edca5be91332622834c8d91 Mon Sep 17 00:00:00 2001
From: eilers <eilers>
Date: Fri, 01 Aug 2003 12:30:16 +0000
Subject: Merging changes from BRANCH_1_0 to HEAD

---
(limited to 'libopie/pim/ocontactaccessbackend_vcard.cpp')

diff --git a/libopie/pim/ocontactaccessbackend_vcard.cpp b/libopie/pim/ocontactaccessbackend_vcard.cpp
index 270bef3..b60c5be 100644
--- a/libopie/pim/ocontactaccessbackend_vcard.cpp
+++ b/libopie/pim/ocontactaccessbackend_vcard.cpp
@@ -17,6 +17,21 @@
  * =====================================================================
  * History:
  * $Log$
+ * Revision 1.11  2003/08/01 12:30:16  eilers
+ * Merging changes from BRANCH_1_0 to HEAD
+ *
+ * Revision 1.10.4.3  2003/07/23 08:54:37  eilers
+ * Default email was added to the list of all emails, which already contains
+ * the default email..
+ * This closes bug #1045
+ *
+ * Revision 1.10.4.2  2003/07/23 08:44:45  eilers
+ * Importing of Notes in vcard files wasn't implemented.
+ * Closes bug #1044
+ *
+ * Revision 1.10.4.1  2003/06/02 13:37:49  eilers
+ * Fixing memory leak
+ *
  * Revision 1.10  2003/04/13 18:07:10  zecke
  * More API doc
  * QString -> const QString&
@@ -151,6 +166,7 @@ bool OContactAccessBackend_VCard::save()
 		cleanVObject( vo );
 	}
 	cleanStrTbl();
+	deleteVObject( obj );
 
 	m_dirty = false;
 	return true;
@@ -446,7 +462,9 @@ OContact OContactAccessBackend_VCard::parseVObject( VObject *obj )
 			c.setBirthday( convVCardDateToDate( value ) );
 
 		}
-
+		else if ( name == VCCommentProp ) {
+			c.setNotes( value );
+		}
 #if 0
 		else {
 			printf("Name: %s, value=%s\n", name.data(), vObjectStringZValue( o ) );
@@ -534,7 +552,7 @@ VObject* OContactAccessBackend_VCard::createVObject( const OContact &c )
 
 
 	QStringList emails = c.emailList();
-	emails.prepend( c.defaultEmail() );
+	// emails.prepend( c.defaultEmail() ); Fix for bugreport #1045
 	for( QStringList::Iterator it = emails.begin(); it != emails.end(); ++it ) {
 		VObject *email = safeAddPropValue( vcard, VCEmailAddressProp, *it );
 		safeAddProp( email, VCInternetProp );
--
cgit v0.9.0.2