about summary refs log tree commit diff stats
path: root/src/otr
diff options
context:
space:
mode:
authorMichael Vetter <jubalh@iodoru.org>2023-03-17 23:58:33 +0100
committerMichael Vetter <jubalh@iodoru.org>2023-03-21 10:53:10 +0100
commite59c401c840f379e64945734969db03b0e55ef22 (patch)
treea6a643a8a308c098a923931e02b0b8dfaf61c128 /src/otr
parente5e8ff221a08939b43edf488fa2a3b8fe95169ea (diff)
downloadprofani-tty-e59c401c840f379e64945734969db03b0e55ef22.tar.gz
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.
Diffstat (limited to 'src/otr')
-rw-r--r--src/otr/otr.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/otr/otr.c b/src/otr/otr.c
index e6015bc0..3297ce57 100644
--- a/src/otr/otr.c
+++ b/src/otr/otr.c
@@ -457,13 +457,7 @@ otr_key_loaded(void)
 char*
 otr_tag_message(const char* const msg)
 {
-    GString* otr_message = g_string_new(msg);
-    g_string_append(otr_message, OTRL_MESSAGE_TAG_BASE);
-    g_string_append(otr_message, OTRL_MESSAGE_TAG_V2);
-    char* result = otr_message->str;
-    g_string_free(otr_message, FALSE);
-
-    return result;
+    return g_strdup_printf("%s%s%s", msg, OTRL_MESSAGE_TAG_BASE, OTRL_MESSAGE_TAG_V2);
 }
 
 gboolean