# HG changeset patch
# User Evan Schoenberg <evan.s@dreskin.net>
# Date 1157922980 0
# Node ID 8bc34ef93e55ff6ac134885ce12a724e8c517f8f
# Parent  108ab3e74d51899ed0c76020fa675a37e4819455
[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>

diff -r 108ab3e74d51 -r 8bc34ef93e55 libgaim/protocols/msn/msn.c
--- a/libgaim/protocols/msn/msn.c	Sun Sep 10 20:46:47 2006 +0000
+++ b/libgaim/protocols/msn/msn.c	Sun Sep 10 21:16:20 2006 +0000
@@ -1856,8 +1856,8 @@
 	char *tooltip_text = info2_data->tooltip_text;
 
 	/* Make sure the connection is still valid if we got here by fetching a photo url */
-	if (error_message == NULL || url_text != NULL ||
-		g_list_find(gaim_connections_get_all(), info_data->gc) == NULL)
+	if (url_text && (error_message != NULL ||
+					 g_list_find(gaim_connections_get_all(), info_data->gc) == NULL))
 	{
 		gaim_debug_warning("msn", "invalid connection. ignoring buddy photo info.\n");
 		g_free(stripped);