1 files changed, 20 insertions, 2 deletions

diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp
index 270bef3..b60c5be 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp
@@ -14,12 +14,27 @@
  *
  * =====================================================================
  * Version: $Id$
  * =====================================================================
  * 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&
  * QString = 0l -> QString::null
  *
  * Revision 1.9  2003/03/21 10:33:09  eilers
@@ -148,12 +163,13 @@ bool OContactAccessBackend_VCard::save()
         for(QMap<int, OContact>::ConstIterator it=m_map.begin(); it !=m_map.end(); ++it ){
                 vo = createVObject( *it );
                 writeVObject( file.directHandle() , vo );
                 cleanVObject( vo );
         }
         cleanStrTbl();
+        deleteVObject( obj );
 
         m_dirty = false;
         return true;
 
 
 }
@@ -443,13 +459,15 @@ OContact OContactAccessBackend_VCard::parseVObject( VObject *obj )
                 }
                 else if ( name == VCBirthDateProp ) {
                         // Reading Birthdate regarding RFC 2425 (5.8.4)
                         c.setBirthday( convVCardDateToDate( value ) );
 
                 }
-
+                else if ( name == VCCommentProp ) {
+                        c.setNotes( value );
+                }
 #if 0
                 else {
                         printf("Name: %s, value=%s\n", name.data(), vObjectStringZValue( o ) );
                         VObjectIterator nit;
                         initPropIterator( &nit, o );
                         while( moreIteration( &nit ) ) {
@@ -531,13 +549,13 @@ VObject* OContactAccessBackend_VCard::createVObject( const OContact &c )
 
         VObject *title = safeAddPropValue( vcard, VCTitleProp, c.jobTitle() );
         safeAddProp( title, VCWorkProp );
 
 
         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 );
         }
 
         safeAddPropValue( vcard, VCNoteProp, c.notes() );