im.pidgin.pidgin.2.2.2: 1785e3a69261085ab115590cccda3a142a464944

[lschiere at pidgin.im]

-----------------------------------------------------------------
Revision: 1785e3a69261085ab115590cccda3a142a464944
Ancestor: 8730f265020e8d69df5fe189860b3fbc60a43edf
Author: lschiere at pidgin.im
Date: 2007-10-21T04:53:02
Branch: im.pidgin.pidgin.2.2.2

Modified files:
        libpurple/protocols/msn/msn.c

ChangeLog: 

applied changes from 78373ac0523b4bcf8530364077593f822030f45d
             through ce7bc52a1e7b3d401f32806e3c3fe19c759152fc

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/msn.c	5cf2c5495f1eee96279c1f3a22642c3397150e5b
+++ libpurple/protocols/msn/msn.c	1283a458be1913c649ba6882d6335b195bb5b2db
@@ -1484,7 +1484,6 @@ msn_got_info(PurpleUtilFetchUrlData *url
 	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 @@ msn_got_info(PurpleUtilFetchUrlData *url
 	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 @@ msn_got_photo(PurpleUtilFetchUrlData *ur
 		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);