[folks] Fall back to the display ID for TpfPersonas with empty aliases

[Philip Withnall <pwithnall src gnome org>]

commit a0232c6fa4ac11f4ee237d3c3e758c5d6c4b93ae
Author: Philip Withnall <philip withnall collabora co uk>
Date:   Wed Aug 25 15:58:02 2010 +0100

    Fall back to the display ID for TpfPersonas with empty aliases

 backends/telepathy/tpf-persona.vala |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/backends/telepathy/tpf-persona.vala b/backends/telepathy/tpf-persona.vala
index 35f9de7..955b2e0 100644
--- a/backends/telepathy/tpf-persona.vala
+++ b/backends/telepathy/tpf-persona.vala
@@ -195,12 +195,15 @@ public class Tpf.Persona : Folks.Persona,
       string uid = this.build_uid ("telepathy", account.get_protocol (), id);
 
       var alias = contact.get_alias ();
+      var display_id = id;
+
+      /* If the alias is empty, fall back to the display ID */
       if (alias == null || alias.strip () == "")
-        alias = uid;
+        alias = display_id;
 
       Object (alias: alias,
               contact: contact,
-              display_id: id,
+              display_id: display_id,
               /* FIXME: This IID format should be moved out to the IMable
                * interface along with the code in
                * Kf.Persona.linkable_property_to_links(), but that depends on