diff options
author | Michael Vetter <jubalh@iodoru.org> | 2023-03-22 15:53:41 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-22 15:53:41 +0100 |
commit | b393363bd513bbea5d7ed5a0fccbef61aff07daa (patch) | |
tree | a6a643a8a308c098a923931e02b0b8dfaf61c128 /src/xmpp/contact.c | |
parent | e5e8ff221a08939b43edf488fa2a3b8fe95169ea (diff) | |
parent | e59c401c840f379e64945734969db03b0e55ef22 (diff) | |
download | profani-tty-b393363bd513bbea5d7ed5a0fccbef61aff07daa.tar.gz |
Merge pull request #1799 from profanity-im/glib276gsf
Adapt to g_string_free glib 2.75.3 change
Diffstat (limited to 'src/xmpp/contact.c')
-rw-r--r-- | src/xmpp/contact.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/xmpp/contact.c b/src/xmpp/contact.c index f31fb16e..36ad3ce9 100644 --- a/src/xmpp/contact.c +++ b/src/xmpp/contact.c @@ -214,22 +214,18 @@ p_contact_name_or_jid(const PContact contact) char* p_contact_create_display_string(const PContact contact, const char* const resource) { - GString* result_str = g_string_new(""); + gchar* result; // 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) { - g_string_append(result_str, " ("); - g_string_append(result_str, resource); - g_string_append(result_str, ")"); + result = g_strdup_printf("%s (%s)", display_name, resource); + } else { + result = g_strdup_printf("%s", display_name); } - char* result = result_str->str; - g_string_free(result_str, FALSE); - return result; } |