$OpenBSD: patch-folks_individual_vala,v 1.3 2018/05/08 07:14:06 ajacoutot Exp $

From 84b78da1fc769aa5abb8db1c52c8c9c6ae15a955 Mon Sep 17 00:00:00 2001
From: Niels De Graef <nielsdegraef@gmail.com>
Date: Sun, 21 Jan 2018 21:05:26 +0100
Subject: Individual: don't always use the display_id.

Index: folks/individual.vala
--- folks/individual.vala.orig
+++ folks/individual.vala
@@ -1936,7 +1936,9 @@ public class Folks.Individual : Object,
 
   private string _look_up_display_id_for_display_name (Persona? p)
     {
-      if (p != null && p.display_id != null)
+      // Sometimes, the display_id will fall back to the IID.
+      // The last condition makes sure we don't use that as a display name
+      if (p != null && p.display_id != null && p.display_id != p.iid)
         {
           return p.display_id;
         }
