Mercurial > pidgin.yaz
comparison libgaim/protocols/msn/msn.c @ 14508:8bc34ef93e55
[gaim-migrate @ 17228]
MSN Get Info always crashes for me in dnsquery.c on the second time it's done. The crash location likes to move around, so it's probably a memory stomper, but we're not sure yet. In any case, MSN was since [17060] not displaying User Info in most (all?) situations because it was treating the connection as invalid if error_message == NULL, when that should be (error_message != NULL). This doesn't change the crash, but the first attempt does display info now.
committer: Tailor Script <tailor@pidgin.im>
author | Evan Schoenberg <evan.s@dreskin.net> |
---|---|
date | Sun, 10 Sep 2006 21:16:20 +0000 |
parents | 705c76724ce2 |
children | 8ed6ef220b2d |
comparison
equal
deleted
inserted
replaced
14507:108ab3e74d51 | 14508:8bc34ef93e55 |
---|---|
1854 GString *s = info2_data->s; | 1854 GString *s = info2_data->s; |
1855 char *photo_url_text = info2_data->photo_url_text; | 1855 char *photo_url_text = info2_data->photo_url_text; |
1856 char *tooltip_text = info2_data->tooltip_text; | 1856 char *tooltip_text = info2_data->tooltip_text; |
1857 | 1857 |
1858 /* Make sure the connection is still valid if we got here by fetching a photo url */ | 1858 /* Make sure the connection is still valid if we got here by fetching a photo url */ |
1859 if (error_message == NULL || url_text != NULL || | 1859 if (url_text && (error_message != NULL || |
1860 g_list_find(gaim_connections_get_all(), info_data->gc) == NULL) | 1860 g_list_find(gaim_connections_get_all(), info_data->gc) == NULL)) |
1861 { | 1861 { |
1862 gaim_debug_warning("msn", "invalid connection. ignoring buddy photo info.\n"); | 1862 gaim_debug_warning("msn", "invalid connection. ignoring buddy photo info.\n"); |
1863 g_free(stripped); | 1863 g_free(stripped); |
1864 g_free(url_buffer); | 1864 g_free(url_buffer); |
1865 g_string_free(s, TRUE); | 1865 g_string_free(s, TRUE); |