diff libpurple/protocols/oscar/family_alert.c @ 17191:1927f4ead3ca

Make all the oscar memory allocations and frees use the glib functions to avoid problems when mixing C runtimes.
author Daniel Atallah <daniel.atallah@gmail.com>
date Tue, 22 May 2007 18:56:09 +0000
parents 32c366eeeb99
children f80f7e1047be
line wrap: on
line diff
--- a/libpurple/protocols/oscar/family_alert.c	Tue May 22 13:00:00 2007 +0000
+++ b/libpurple/protocols/oscar/family_alert.c	Tue May 22 18:56:09 2007 +0000
@@ -111,10 +111,10 @@
 	for (new = od->emailinfo; (new && memcmp(cookie16, new->cookie16, 16)); new = new->next);
 	if (new) {
 		/* Free some of the old info, if it exists */
-		free(new->cookie8);
-		free(new->cookie16);
-		free(new->url);
-		free(new->domain);
+		g_free(new->cookie8);
+		g_free(new->cookie16);
+		g_free(new->url);
+		g_free(new->domain);
 	} else {
 		/* We don't already have info, so create a new struct for it */
 		new = g_new0(struct aim_emailinfo, 1);
@@ -154,8 +154,8 @@
 
 	aim_tlvlist_free(&tlvlist);
 
-	free(alertitle);
-	free(alerturl);
+	g_free(alertitle);
+	g_free(alerturl);
 
 	return ret;
 }
@@ -210,11 +210,11 @@
 	{
 		struct aim_emailinfo *tmp = od->emailinfo;
 		od->emailinfo = od->emailinfo->next;
-		free(tmp->cookie16);
-		free(tmp->cookie8);
-		free(tmp->url);
-		free(tmp->domain);
-		free(tmp);
+		g_free(tmp->cookie16);
+		g_free(tmp->cookie8);
+		g_free(tmp->url);
+		g_free(tmp->domain);
+		g_free(tmp);
 	}
 
 	return;