From 9da4a6e1b9f13b253de3d029ef5cfb31a7109fa8 Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Sun, 5 Jan 2014 00:38:45 +0000
Subject: [PATCH] Refactored contact display string

---
 src/contact.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/contact.c b/src/contact.c
index 0b955548..b2bef275 100644
--- a/src/contact.c
+++ b/src/contact.c
@@ -171,12 +171,9 @@ p_contact_create_display_string(const PContact contact, const char * const resou
 {
     GString *result_str = g_string_new("");
 
-    // use nickname if exists
-    if (contact->name != NULL) {
-        g_string_append(result_str, contact->name);
-    } else {
-        g_string_append(result_str, contact->barejid);
-    }
+    // use nickname if exists                                                         
+    const char *display_name = p_contact_name_or_jid(contact);                   
+    g_string_append(result_str, display_name);   
 
     // add resource if not default provided by profanity
     if (strcmp(resource, "__prof_default") != 0) {