From e59c401c840f379e64945734969db03b0e55ef22 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Fri, 17 Mar 2023 23:58:33 +0100 Subject: Adapt to g_string_free glib 2.75.3 change glib 2.75.3 changes warning behaviour of `g_string_free()`. See: * https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3219 * https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3226 Use this opportunity to replace the use of GString with `g_strdup_printf()` where possible. Otherwise correctly take the return value of `g_string_free()` which is nicer anyways. --- src/xmpp/contact.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src/xmpp/contact.c') 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; } -- cgit 1.4.1-2-gfad0