From 3a77bdfdfba1c9fbe97078b0484fffc9935a9eb0 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Wed, 7 Jul 2010 16:11:58 +0100 Subject: [PATCH] Improve filtering of empty aliases --- backends/telepathy/tpf-persona.vala | 2 +- folks/individual.vala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backends/telepathy/tpf-persona.vala b/backends/telepathy/tpf-persona.vala index f323bae..88697bd 100644 --- a/backends/telepathy/tpf-persona.vala +++ b/backends/telepathy/tpf-persona.vala @@ -185,7 +185,7 @@ public class Tpf.Persona : Folks.Persona, var iid = "telepathy:" + account_id + ":" + uid; var alias = contact.get_alias (); - if (alias == null || alias == "") + if (alias == null || alias.strip () == "") alias = uid; Object (alias: alias, diff --git a/folks/individual.vala b/folks/individual.vala index fb5b73d..20d4d70 100644 --- a/folks/individual.vala +++ b/folks/individual.vala @@ -495,7 +495,7 @@ public class Folks.Individual : Object, { var a = (Alias) p; - if (alias == null || alias.strip () == "") + if (alias == null && a.alias.strip () != "") alias = a.alias; } }); -- 2.7.4