Mercurial > pidgin3 / file diff

--- a/libpurple/protocols/jabber/caps.c	Sun Nov 03 20:33:05 2019 +0300
+++ b/libpurple/protocols/jabber/caps.c	Sun Nov 03 20:37:07 2019 +0300
@@ -100,15 +100,7 @@
 	if (info == NULL)
 		return;
 
-	while(info->identities) {
-		JabberIdentity *id = info->identities->data;
-		g_free(id->category);
-		g_free(id->type);
-		g_free(id->name);
-		g_free(id->lang);
-		g_free(id);
-		info->identities = g_list_delete_link(info->identities, info->identities);
-	}
+	g_list_free_full(info->identities, (GDestroyNotify)jabber_identity_free);
 
 	free_string_glist(info->features);
 
@@ -266,12 +258,7 @@
 					if (!category || !type)
 						continue;
 
-					id = g_new0(JabberIdentity, 1);
-					id->category = g_strdup(category);
-					id->type = g_strdup(type);
-					id->name = g_strdup(name);
-					id->lang = g_strdup(lang);
-
+					id = jabber_identity_new(category, type, lang, name);
 					value->identities = g_list_append(value->identities,id);
 				} else if (purple_strequal(child->name, "x")) {
 					/* TODO: See #7814 -- this might cause problems if anyone
@@ -753,12 +740,7 @@
 			if (!category || !type)
 				continue;
 
-			id = g_new0(JabberIdentity, 1);
-			id->category = g_strdup(category);
-			id->type = g_strdup(type);
-			id->name = g_strdup(name);
-			id->lang = g_strdup(lang);
-
+			id = jabber_identity_new(category, type, lang, name);
 			info->identities = g_list_append(info->identities, id);
 		} else if (purple_strequal(child->name, "feature")) {
 			/* parse feature */