From 9092b20eb1a537ad44ecf49f261825aa05dd2904 Mon Sep 17 00:00:00 2001
From: Matt Vogt <matthew.vogt@jollamobile.com>
Date: Fri, 16 Aug 2013 15:56:10 +1000
Subject: [PATCH] [libcontacts] Fallback to backend display label

Also do not use any empty values for the display label.
---
 src/seasidecache.cpp | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/seasidecache.cpp b/src/seasidecache.cpp
index d5d1d2f..275ab0c 100644
--- a/src/seasidecache.cpp
+++ b/src/seasidecache.cpp
@@ -885,7 +885,7 @@ QString SeasideCache::generateDisplayLabel(const QContact &contact, DisplayLabel
 #else
     QString customLabel = name.customLabel();
 #endif
-    if (!customLabel.isNull())
+    if (!customLabel.isEmpty())
         return customLabel;
 
     QString displayLabel;
@@ -900,10 +900,10 @@ QString SeasideCache::generateDisplayLabel(const QContact &contact, DisplayLabel
         nameStr2 = name.lastName();
     }
 
-    if (!nameStr1.isNull())
+    if (!nameStr1.isEmpty())
         displayLabel.append(nameStr1);
 
-    if (!nameStr2.isNull()) {
+    if (!nameStr2.isEmpty()) {
         if (!displayLabel.isEmpty())
             displayLabel.append(" ");
         displayLabel.append(nameStr2);
@@ -913,53 +913,61 @@ QString SeasideCache::generateDisplayLabel(const QContact &contact, DisplayLabel
         return displayLabel;
     }
 
+    // Try to generate a label from the contact details, in our preferred order
     displayLabel = generateDisplayLabelFromNonNameDetails(contact);
     if (!displayLabel.isEmpty()) {
         return displayLabel;
     }
 
+    // If no label was determined from any of the available detail, fallback to the backend's label
+    displayLabel = contact.detail<QContactDisplayLabel>().label();
+    if (!displayLabel.isEmpty()) {
+        return displayLabel;
+    }
+
     return "(Unnamed)"; // TODO: localisation
 }
 
 QString SeasideCache::generateDisplayLabelFromNonNameDetails(const QContact &contact)
 {
     foreach (const QContactNickname& nickname, contact.details<QContactNickname>()) {
-        if (!nickname.nickname().isNull()) {
+        if (!nickname.nickname().isEmpty()) {
             return nickname.nickname();
         }
     }
 
     foreach (const QContactGlobalPresence& gp, contact.details<QContactGlobalPresence>()) {
         // should only be one of these, but qtct is strange, and doesn't list it as a unique detail in the schema...
-        if (!gp.nickname().isNull()) {
+        if (!gp.nickname().isEmpty()) {
             return gp.nickname();
         }
     }
 
     foreach (const QContactPresence& presence, contact.details<QContactPresence>()) {
-        if (!presence.nickname().isNull()) {
+        if (!presence.nickname().isEmpty()) {
             return presence.nickname();
         }
     }
 
     foreach (const QContactOnlineAccount& account, contact.details<QContactOnlineAccount>()) {
-        if (!account.accountUri().isNull()) {
+        if (!account.accountUri().isEmpty()) {
             return account.accountUri();
         }
     }
 
     foreach (const QContactEmailAddress& email, contact.details<QContactEmailAddress>()) {
-        if (!email.emailAddress().isNull()) {
+        if (!email.emailAddress().isEmpty()) {
             return email.emailAddress();
         }
     }
 
     QContactOrganization company = contact.detail<QContactOrganization>();
-    if (!company.name().isNull())
+    if (!company.name().isEmpty()) {
         return company.name();
+    }
 
     foreach (const QContactPhoneNumber& phone, contact.details<QContactPhoneNumber>()) {
-        if (!phone.number().isNull())
+        if (!phone.number().isEmpty())
             return phone.number();
     }