Cardview update: It is more compressed. Pending: Add pricture for work- and home address..

1 files changed, 9 insertions, 9 deletions

diff --git a/libopie2/opiepim/ocontact.cpp b/libopie2/opiepim/ocontact.cpp
index 3473baa..e34feeb 100644
--- a/libopie2/opiepim/ocontact.cpp
+++ b/libopie2/opiepim/ocontact.cpp
@@ -476,3 +476,3 @@ QString OContact::toRichText() const
          !businessZip().isEmpty() || !businessCountry().isEmpty() ) {
-        text += QObject::tr( "<br><br><b>Work Address:</b>" );
+        text += QObject::tr( "<br><b>Work Address:</b>" );
         marker = true;
@@ -492,7 +492,7 @@ QString OContact::toRichText() const
                     
-            } else
-                    text += "<br>";
-
+            }
             if ( !(value = businessCity()).isEmpty() ) {
                     marker = true;
+                    if ( businessZip().isEmpty() && !businessStreet().isEmpty() )
+                            text += "<br>";
                     text += Qtopia::escapeString(value);
@@ -568,3 +568,3 @@ QString OContact::toRichText() const
 
-    text += "<br>";
+    // text += "<br>";
 
@@ -573,3 +573,3 @@ QString OContact::toRichText() const
          !homeZip().isEmpty() || !homeCountry().isEmpty() ) {
-        text += QObject::tr( "<br><br><b>Home Address:</b>" );
+        text += QObject::tr( "<br><b>Home Address:</b>" );
         marker = true;
@@ -588,7 +588,7 @@ QString OContact::toRichText() const
                     marker = true;
-            } else
-                    text += "<br>";
-
+            }
             if ( !(value = homeCity()).isEmpty() ) {
                     marker = true;
+                    if ( homeZip().isEmpty() && !homeStreet().isEmpty() )
+                            text += "<br>";
                     text += Qtopia::escapeString(value);