merge/upstream-full #105

Manually merged
jabber.developer merged 407 commits from merge/upstream-full into master 2026-05-26 17:54:34 +00:00
245 changed files with 7442 additions and 28322 deletions
Showing only changes of commit 776bc262d0 - Show all commits

View File

@@ -1229,10 +1229,8 @@ vcard_print(xmpp_ctx_t* ctx, ProfWin* window, char* jid)
_userdata* data = g_new0(_userdata, 1);
data->vcard = vcard_new();
if (!data || !data->vcard) {
if (data) {
g_free(data);
}
if (!data->vcard) {
g_free(data);
cons_show("vCard allocation failed");
return;
@@ -1379,10 +1377,8 @@ vcard_photo(xmpp_ctx_t* ctx, char* jid, char* filename, int index, gboolean open
_userdata* data = g_new0(_userdata, 1);
data->vcard = vcard_new();
if (!data || !data->vcard) {
if (data) {
free(data);
}
if (!data->vcard) {
g_free(data);
cons_show("vCard allocation failed");
return;