diff options
| author | James Booth <boothj5@gmail.com> | 2014-01-05 01:20:42 +0000 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2014-01-05 01:20:42 +0000 |
| commit | f569845b40057dcc90d588e46147f7694a0b5e1b (patch) | |
| tree | 79e098d84c25da9f481b2d965ae6156c4e7806ae /src/contact.c | |
| parent | e504c030a6325fc41d7daf667b2158cb31d8773e (diff) | |
| parent | 5898da963a254294ce5dd24b8a9534256f7efd45 (diff) | |
| download | profani-tty-f569845b40057dcc90d588e46147f7694a0b5e1b.tar.gz | |
Merge branch 'master' into otr
Conflicts: .gitignore
Diffstat (limited to 'src/contact.c')
| -rw-r--r-- | src/contact.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/contact.c b/src/contact.c index 0b955548..f2f74349 100644 --- a/src/contact.c +++ b/src/contact.c @@ -172,11 +172,8 @@ 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); - } + 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) { |