diff options
| author | Luke Schierer <lschiere@pidgin.im> | 2007-10-21 04:53:02 +0000 |
|---|---|---|
| committer | Luke Schierer <lschiere@pidgin.im> | 2007-10-21 04:53:02 +0000 |
| commit | af85d0ec4c94ac0487c6ebc6c0dd6b1aead7bd7a (patch) | |
| tree | 577d996110f059ec55a5ad72a75cf8a08c7eaa39 | |
| parent | c05cf2a168736f16f8e5a9fc8b09450e18a4bf7c (diff) | |
| download | pidgin-af85d0ec4c94ac0487c6ebc6c0dd6b1aead7bd7a.tar.gz | |
applied changes from 78373ac0523b4bcf8530364077593f822030f45d
through ce7bc52a1e7b3d401f32806e3c3fe19c759152fc
| -rw-r--r-- | libpurple/protocols/msn/msn.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/libpurple/protocols/msn/msn.c b/libpurple/protocols/msn/msn.c index 73c042cb48..5d52be6f01 100644 --- a/libpurple/protocols/msn/msn.c +++ b/libpurple/protocols/msn/msn.c @@ -1484,7 +1484,6 @@ msn_got_info(PurpleUtilFetchUrlData *url_data, gpointer data, 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_data, gpointer data, 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 *url_data, gpointer user_data, 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); |