# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1192942382 0
# Node ID a482263cf1d8152f5504ffa965fc85fc2ed1e6ef
# Parent  45cf81350a75de9b5740d7b72b99d3da03184f0e
applied changes from 78373ac0523b4bcf8530364077593f822030f45d
             through ce7bc52a1e7b3d401f32806e3c3fe19c759152fc

diff -r 45cf81350a75 -r a482263cf1d8 libpurple/protocols/msn/msn.c
--- a/libpurple/protocols/msn/msn.c	Sun Oct 21 04:51:58 2007 +0000
+++ b/libpurple/protocols/msn/msn.c	Sun Oct 21 04:53:02 2007 +0000
@@ -1484,7 +1484,6 @@
 	gboolean sect_info = FALSE;
 	gboolean has_contact_info = FALSE;
 	char *url_buffer;
-	GString *s, *s2;
 	int stripped_len;
 #if PHOTO_SUPPORT
 	char *photo_url_text = NULL;
@@ -1569,11 +1568,6 @@
 	purple_debug_misc("msn", "stripped = %p\n", stripped);
 	purple_debug_misc("msn", "url_buffer = %p\n", url_buffer);
 
-	/* Gonna re-use the memory we've already got for url_buffer */
-	/* No we're not. */
-	s = g_string_sized_new(strlen(url_buffer));
-	s2 = g_string_sized_new(strlen(url_buffer));
-
 	/* General section header */
 	if (has_tooltip_text)
 		purple_notify_user_info_add_section_break(user_info);
@@ -1919,7 +1913,7 @@
 		purple_debug_warning("msn", "invalid connection. ignoring buddy photo info.\n");
 		g_free(stripped);
 		g_free(url_buffer);
-		g_free(user_info);
+		purple_notify_user_info_destroy(user_info);
 		g_free(info_data->name);
 		g_free(info_data);
 		g_free(photo_url_text);