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/command/cmd_funcs.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/command/cmd_funcs.c')
-rw-r--r-- | src/command/cmd_funcs.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/command/cmd_funcs.c b/src/command/cmd_funcs.c index dc471b90..919b7ddb 100644 --- a/src/command/cmd_funcs.c +++ b/src/command/cmd_funcs.c @@ -3635,12 +3635,7 @@ cmd_join(ProfWin* window, const char* const command, gchar** args) // server not supplied (room), use account preference } else if (account->muc_service) { - GString* room_str = g_string_new(""); - g_string_append(room_str, args[0]); - g_string_append(room_str, "@"); - g_string_append(room_str, account->muc_service); - room = room_str->str; - g_string_free(room_str, FALSE); + room = g_strdup_printf("%s@%s", args[0], account->muc_service); // no account preference } else { @@ -10107,13 +10102,7 @@ cmd_vcard_photo(ProfWin* window, const char* const command, gchar** args) jid_destroy(jid_occupant); } else { // anon muc: send the vcard request through the MUC's server - GString* full_jid = g_string_new(mucwin->roomjid); - g_string_append(full_jid, "/"); - g_string_append(full_jid, user); - - jid = full_jid->str; - - g_string_free(full_jid, FALSE); + jid = g_strdup_printf("%s/%s", mucwin->roomjid, user); } } else { char* jid_temp = roster_barejid_from_name(user); |