summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/pim/ocontact.cpp8
-rw-r--r--libopie2/opiepim/ocontact.cpp8
2 files changed, 12 insertions, 4 deletions
diff --git a/libopie/pim/ocontact.cpp b/libopie/pim/ocontact.cpp
index efa2777..6aec62e 100644
--- a/libopie/pim/ocontact.cpp
+++ b/libopie/pim/ocontact.cpp
@@ -504,5 +504,9 @@ QString OContact::toRichText() const
504 QString str; 504 QString str;
505 QString defEmail = defaultEmail();
506 if ( !defEmail.isEmpty() )
507 text += "<b>" + QObject::tr("Default Email: ") + "</b>"
508 + Qtopia::escapeString(defEmail) + "<br>";
505 str = emails(); 509 str = emails();
506 if ( !str.isEmpty() ) 510 if ( !str.isEmpty() && ( str != defEmail ) )
507 text += "<b>" + QObject::tr("Email Addresses: ") + "</b>" 511 text += "<b>" + QObject::tr("All Emails: ") + "</b>"
508 + Qtopia::escapeString(str) + "<br>"; 512 + Qtopia::escapeString(str) + "<br>";
diff --git a/libopie2/opiepim/ocontact.cpp b/libopie2/opiepim/ocontact.cpp
index efa2777..6aec62e 100644
--- a/libopie2/opiepim/ocontact.cpp
+++ b/libopie2/opiepim/ocontact.cpp
@@ -504,5 +504,9 @@ QString OContact::toRichText() const
504 QString str; 504 QString str;
505 QString defEmail = defaultEmail();
506 if ( !defEmail.isEmpty() )
507 text += "<b>" + QObject::tr("Default Email: ") + "</b>"
508 + Qtopia::escapeString(defEmail) + "<br>";
505 str = emails(); 509 str = emails();
506 if ( !str.isEmpty() ) 510 if ( !str.isEmpty() && ( str != defEmail ) )
507 text += "<b>" + QObject::tr("Email Addresses: ") + "</b>" 511 text += "<b>" + QObject::tr("All Emails: ") + "</b>"
508 + Qtopia::escapeString(str) + "<br>"; 512 + Qtopia::escapeString(str) + "<br>";