email handling fixed

1 files changed, 3 insertions, 3 deletions

diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index 5c1391b..12d7421 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -1396,49 +1396,49 @@ void ContactEditor::setEntry( const OContact &entry ) {
         }
 
         QStringList::Iterator itV;
         for ( it = slChooserNames.begin(), itV = slChooserValues.begin(); it != slChooserNames.end(); ++it, ++itV ) {
 
                 if ( *it == tr("Business Phone") || *it == tr("Work Phone" ))
                         *itV = ent.businessPhone();
 /*
                 if ( *it == "Business 2 Phone" )
                         *itV = ent.business2Phone();
 */
                 if ( *it == tr("Business Fax") || *it == tr("Work Fax" ))
                         *itV = ent.businessFax();
 
                 if ( *it == tr("Business Mobile") || *it == tr("work Mobile" ))
                         *itV = ent.businessMobile();
 /*
                 if ( *it == "Company Phone" )
                         *itV = ent.companyPhone();
 */
                 if ( *it == tr("Default Email" ))
                         *itV = ent.defaultEmail();
 
                 if ( *it == tr("Emails" ))
-                        *itV = ent.emailList().join(","); // :SX
+                        *itV = ent.emailList().join(", ");  // :SX
 
                 if ( *it == tr("Home Phone" ))
                         *itV = ent.homePhone();
 /*
                 if ( *it == "Home 2 Phone" )
                         *itV = ent.home2Phone();
 */
                 if ( *it == tr("Home Fax" ))
                         *itV = ent.homeFax();
 
                 if ( *it == tr("Home Mobile" ))
                         *itV = ent.homeMobile();
 /*
                 if ( *it == "Car Phone" )
                         *itV = ent.carPhone();
 
                 if ( *it == "ISDN Phone" )
                         *itV = ent.ISDNPhone();
 
                 if ( *it == "Other Phone" )
                         *itV = ent.otherPhone();
 */
                 if ( *it == tr("Business Pager") || *it == tr("Work Pager" ))
                         *itV = ent.businessPager();
@@ -1596,51 +1596,51 @@ void ContactEditor::saveEntry() {
         for ( it = slChooserNames.begin(), itV = slChooserValues.begin(); it != slChooserNames.end(); ++it, ++itV ) {
 
                 if ( *it == tr("Business Phone") || *it == tr("Work Phone" ))
                         ent.setBusinessPhone( *itV );
 /*
                 if ( *it == tr("Business 2 Phone" )
                         ent.setBusiness2Phone( *itV );
 */
                 if ( *it == tr("Business Fax") || *it == tr("Work Fax" ))
                         ent.setBusinessFax( *itV );
 
                 if ( *it == tr("Business Mobile") || *it == tr("Work Mobile" ))
                         ent.setBusinessMobile( *itV );
 /*
                 if ( *it == "Company Phone" )
                         ent.setCompanyPhone( *itV );
 */
                 //if ( *it == "Default Email" )
                         //ent.setDefaultEmail( *itV );
 
                 if ( *it == tr("Emails" )) {
                         QString allemail;
                         QString defaultmail;
                         parseEmailFrom( *itV, defaultmail, allemail );
-                        ent.clearEmails();
+                        // ent.clearEmails();
                         ent.setDefaultEmail(  defaultmail );
-                        ent.insertEmails( *itV );
+                        ent.setEmails( allemail );
                 }
 
                 if ( *it == tr("Home Phone" ))
                         ent.setHomePhone( *itV );
 /*
                 if ( *it == "Home 2 Phone" )
                         ent.setHome2Phone( *itV );
 */
                 if ( *it == tr("Home Fax" ))
                         ent.setHomeFax( *itV );
 
                 if ( *it == tr("Home Mobile" ))
                         ent.setHomeMobile( *itV );
 /*
                 if ( *it == "Car Phone" )
                         ent.setCarPhone( *itV );
 
                 if ( *it == "ISDN Phone" )
                         ent.setISDNPhone( *itV );
 
                 if ( *it == "Other Phone" )
                         ent.setOtherPhone( *itV );
 */
                 if ( *it == tr("Business Pager") || *it == tr("Work Pager") )