[Gaim-commits] SF.net SVN: gaim: [17228] trunk/libgaim/protocols/msn/msn.c

[<ev...@us...>]

Revision: 17228
          http://svn.sourceforge.net/gaim/?rev=17228&view=rev
Author:   evands
Date:     2006-09-10 14:16:20 -0700 (Sun, 10 Sep 2006)

Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/libgaim/protocols/msn/msn.c

Modified: trunk/libgaim/protocols/msn/msn.c
===================================================================
--- trunk/libgaim/protocols/msn/msn.c	2006-09-10 20:46:47 UTC (rev 17227)
+++ trunk/libgaim/protocols/msn/msn.c	2006-09-10 21:16:20 UTC (rev 17228)
@@ -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);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.