-rw-r--r-- | core/pim/addressbook/addressbook.cpp | 2 | ||||
-rw-r--r-- | core/pim/addressbook/contacteditor.cpp | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp index e11cf4c..3255269 100644 --- a/core/pim/addressbook/addressbook.cpp +++ b/core/pim/addressbook/addressbook.cpp | |||
@@ -529,7 +529,7 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data) | |||
529 | cnt.setFirstName( fn ); | 529 | cnt.setFirstName( fn ); |
530 | cnt.setMiddleName( mn ); | 530 | cnt.setMiddleName( mn ); |
531 | cnt.setLastName( ln ); | 531 | cnt.setLastName( ln ); |
532 | cnt.setEmails( email ); | 532 | cnt.insertEmails( email ); |
533 | cnt.setDefaultEmail( email ); | 533 | cnt.setDefaultEmail( email ); |
534 | cnt.setFileAs(); | 534 | cnt.setFileAs(); |
535 | 535 | ||
diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp index 39bd63c..ae86ed0 100644 --- a/core/pim/addressbook/contacteditor.cpp +++ b/core/pim/addressbook/contacteditor.cpp | |||
@@ -111,7 +111,7 @@ void ContactEditor::init() { | |||
111 | //slDynamicEntries->remove( it ); | 111 | //slDynamicEntries->remove( it ); |
112 | continue; | 112 | continue; |
113 | } | 113 | } |
114 | 114 | ||
115 | if ( (*it) == tr( "Home Fax" ) ) { | 115 | if ( (*it) == tr( "Home Fax" ) ) { |
116 | slChooserNames.append( *it ); | 116 | slChooserNames.append( *it ); |
117 | slChooserValues.append("" ); | 117 | slChooserValues.append("" ); |
@@ -191,7 +191,7 @@ void ContactEditor::init() { | |||
191 | //slDynamicEntries->remove( it ); | 191 | //slDynamicEntries->remove( it ); |
192 | continue; | 192 | continue; |
193 | } | 193 | } |
194 | 194 | ||
195 | if ( *it == "Name Title" || *it == "First Name" || *it == "Middle Name" || *it == "Last Name" || *it == "File As" || *it == "Default Email" || *it == "Emails" || *it == "Groups" ) | 195 | if ( *it == "Name Title" || *it == "First Name" || *it == "Middle Name" || *it == "Last Name" || *it == "File As" || *it == "Default Email" || *it == "Emails" || *it == "Groups" ) |
196 | continue; | 196 | continue; |
197 | 197 | ||
@@ -270,7 +270,7 @@ void ContactEditor::init() { | |||
270 | hasStreet2 = TRUE; | 270 | hasStreet2 = TRUE; |
271 | //slDynamicEntries->remove( it ); | 271 | //slDynamicEntries->remove( it ); |
272 | continue; | 272 | continue; |
273 | } | 273 | } |
274 | 274 | ||
275 | if ( (*it).right( 8 ) == tr( "P.O. Box" ) ) { | 275 | if ( (*it).right( 8 ) == tr( "P.O. Box" ) ) { |
276 | hasPOBox = TRUE; | 276 | hasPOBox = TRUE; |
@@ -1034,7 +1034,7 @@ void ContactEditor::slotName() { | |||
1034 | } | 1034 | } |
1035 | dlgName->showMaximized(); | 1035 | dlgName->showMaximized(); |
1036 | if ( dlgName->exec() ) { | 1036 | if ( dlgName->exec() ) { |
1037 | 1037 | ||
1038 | tmpName = txtFirstName->text() + " " + txtMiddleName->text() + " " + txtLastName->text() + " " + txtSuffix->text(); | 1038 | tmpName = txtFirstName->text() + " " + txtMiddleName->text() + " " + txtLastName->text() + " " + txtSuffix->text(); |
1039 | txtFullName->setText( tmpName.simplifyWhiteSpace() ); | 1039 | txtFullName->setText( tmpName.simplifyWhiteSpace() ); |
1040 | slotFullNameChange( txtFullName->text() ); | 1040 | slotFullNameChange( txtFullName->text() ); |
@@ -1417,7 +1417,7 @@ void ContactEditor::setEntry( const Contact &entry ) { | |||
1417 | *itV = ent.defaultEmail(); | 1417 | *itV = ent.defaultEmail(); |
1418 | 1418 | ||
1419 | if ( *it == tr("Emails" )) | 1419 | if ( *it == tr("Emails" )) |
1420 | *itV = ent.emails(); | 1420 | *itV = ent.emailList().join(";"); |
1421 | 1421 | ||
1422 | if ( *it == tr("Home Phone" )) | 1422 | if ( *it == tr("Home Phone" )) |
1423 | *itV = ent.homePhone(); | 1423 | *itV = ent.homePhone(); |
@@ -1618,7 +1618,7 @@ void ContactEditor::saveEntry() { | |||
1618 | QString defaultmail; | 1618 | QString defaultmail; |
1619 | parseEmailFrom( *itV, defaultmail, allemail ); | 1619 | parseEmailFrom( *itV, defaultmail, allemail ); |
1620 | ent.setDefaultEmail( defaultmail ); | 1620 | ent.setDefaultEmail( defaultmail ); |
1621 | ent.setEmails( *itV ); | 1621 | ent.insertEmails( *itV ); |
1622 | } | 1622 | } |
1623 | 1623 | ||
1624 | if ( *it == tr("Home Phone" )) | 1624 | if ( *it == tr("Home Phone" )) |