pidgin: 37604e59: Apply Paul's second patch to fix some me...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 37604e59d5a53b761fa4d623e577ff79499b32a5
Ancestor: f0df27a299120baecf9ea88a9fb24ffe1dbe72fd
Author: qulogic at pidgin.im
Date: 2009-03-30T05:50:34
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/37604e59d5a53b761fa4d623e577ff79499b32a5

Modified files:
        libpurple/protocols/oscar/oscar.c pidgin/gtkutils.c

ChangeLog: 

Apply Paul's second patch to fix some memory leaks found in valgrind.

References #8786.

-------------- next part --------------
============================================================
--- libpurple/protocols/oscar/oscar.c	789c6dcec44a528997926f1810fd0936a76712d1
+++ libpurple/protocols/oscar/oscar.c	74d777b24abab62b64f589d9d30dcdc79f354406
@@ -4847,6 +4847,7 @@ oscar_set_info_and_status(PurpleAccount 
 		/* TODO: Combine these two calls! */
 		aim_srv_setextrainfo(od, FALSE, 0, TRUE, status_text, itmsurl);
 		oscar_set_extendedstatus(gc);
+		g_free(status_text);
 	}
 }
 
============================================================
--- pidgin/gtkutils.c	0b687a8ca61e1a519312a7f9113b8fd8954c8a20
+++ pidgin/gtkutils.c	eabb9d677f339f0ec49f920eebb6906267840094
@@ -3578,7 +3578,9 @@ register_gnome_url_handlers(void)
 	if (tmp == NULL)
 		return FALSE;
 
+	g_free(tmp);
 	tmp = NULL;
+
 	if (!g_spawn_command_line_sync("gconftool-2 --all-dirs /desktop/gnome/url-handlers",
 	                               &tmp, &err, NULL, NULL))
 	{