| author | eilers <eilers> | 2003-09-08 12:42:26 (UTC) |
|---|---|---|
| committer | eilers <eilers> | 2003-09-08 12:42:26 (UTC) |
| commit | 913788f77c3f501778b7653317a4a6b06452961d (patch) (side-by-side diff) | |
| tree | b9393e5b7eefb87f3a421a17035b702a6b688eb7 | |
| parent | 7fb091e12eec52e3d73896c728fc011fe40a3eb4 (diff) | |
| download | opie-913788f77c3f501778b7653317a4a6b06452961d.zip opie-913788f77c3f501778b7653317a4a6b06452961d.tar.gz opie-913788f77c3f501778b7653317a4a6b06452961d.tar.bz2 | |
Fixing bug #1161: No space between jobtitle and organization
| -rw-r--r-- | libopie/pim/ocontact.cpp | 12 | ||||
| -rw-r--r-- | libopie2/opiepim/ocontact.cpp | 12 |
2 files changed, 8 insertions, 16 deletions
diff --git a/libopie/pim/ocontact.cpp b/libopie/pim/ocontact.cpp index 0f05b65..fcf3b26 100644 --- a/libopie/pim/ocontact.cpp +++ b/libopie/pim/ocontact.cpp @@ -447,21 +447,17 @@ QString OContact::toRichText() const if ( !(value = fullName()).isEmpty() ) text += "<b><h3><img src=\"addressbook/AddressBook\"> " + Qtopia::escapeString(value) + "</h3></b>"; if ( !(value = jobTitle()).isEmpty() ) - text += Qtopia::escapeString(value); + text += Qtopia::escapeString(value) + " "; comp = company(); if ( !(value = department()).isEmpty() ) { text += Qtopia::escapeString(value); if ( comp ) - text += ", "; - else - text += "<br>"; - } - if ( !comp.isEmpty() ) - text += Qtopia::escapeString(comp); - + text += ", " + Qtopia::escapeString(comp); + }else if ( comp ) + text += "<br>" + Qtopia::escapeString(comp); text += "<br><hr>"; // defailt email QString defEmail = defaultEmail(); diff --git a/libopie2/opiepim/ocontact.cpp b/libopie2/opiepim/ocontact.cpp index 0f05b65..fcf3b26 100644 --- a/libopie2/opiepim/ocontact.cpp +++ b/libopie2/opiepim/ocontact.cpp @@ -447,21 +447,17 @@ QString OContact::toRichText() const if ( !(value = fullName()).isEmpty() ) text += "<b><h3><img src=\"addressbook/AddressBook\"> " + Qtopia::escapeString(value) + "</h3></b>"; if ( !(value = jobTitle()).isEmpty() ) - text += Qtopia::escapeString(value); + text += Qtopia::escapeString(value) + " "; comp = company(); if ( !(value = department()).isEmpty() ) { text += Qtopia::escapeString(value); if ( comp ) - text += ", "; - else - text += "<br>"; - } - if ( !comp.isEmpty() ) - text += Qtopia::escapeString(comp); - + text += ", " + Qtopia::escapeString(comp); + }else if ( comp ) + text += "<br>" + Qtopia::escapeString(comp); text += "<br><hr>"; // defailt email QString defEmail = defaultEmail(); |