devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-19 17:06:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adapt to g_string_free glib 2.75.3 change

Browse Source 
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.
This commit is contained in:
Michael Vetter
2023-03-17 23:58:33 +01:00
parent e5e8ff221a
commit e59c401c84
17 changed files with 44 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/command/cmd_ac.c
View File

@@ -3817,12 +3817,7 @@ _subject_autocomplete(ProfWin* window, const char* const input, gboolean previou
char* subject = muc_subject(mucwin->roomjid);
if (subject) {
GString* result_str = g_string_new("/subject edit \"");
g_string_append(result_str, subject);
g_string_append(result_str, "\"");
result = result_str->str;
g_string_free(result_str, FALSE);
result = g_strdup_printf("/subject edit \"%s\"", subject);
}
}
}
@@ -4260,10 +4255,7 @@ _correction_autocomplete(ProfWin* window, const char* const input, gboolean prev
static char*
_correct_autocomplete(ProfWin* window, const char* const input, gboolean previous)
{
GString* result_str = g_string_new("/correct ");
g_string_append(result_str, win_get_last_sent_message(window));
char* result = result_str->str;
g_string_free(result_str, FALSE);
char* result = g_strdup_printf("/correct %s", win_get_last_sent_message(window));
return result;
}

5
src/command/cmd_defs.c
View File

@@ -2738,10 +2738,7 @@ _cmd_index(const Command* cmd)
}
g_strfreev(tokens);
char* res = index->str;
g_string_free(index, FALSE);
return res;
return g_string_free(index, FALSE);
}
GList*

15
src/command/cmd_funcs.c
View File

@@ -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);