changeset 28684:97856e3452d0

Don't crash is passport is NULL on Windows. I don't know why this would happen, but there's a g_return_if_fail checking it, so it must happen at some point.
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Sat, 03 Oct 2009 20:01:35 +0000
parents 3397fb5f89cf
children 534ff54568eb
files libpurple/protocols/msn/contact.c
diffstat 1 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/protocols/msn/contact.c	Sat Oct 03 03:25:05 2009 +0000
+++ b/libpurple/protocols/msn/contact.c	Sat Oct 03 20:01:35 2009 +0000
@@ -1418,11 +1418,12 @@
 	xmlnode *contact_info;
 	xmlnode *changes;
 
-	purple_debug_info("msn", "Update contact information with new %s: %s\n",
+	purple_debug_info("msn", "Update contact information for %s with new %s: %s\n",
+		passport ? passport : "(null)",
 		type == MSN_UPDATE_DISPLAY ? "display name" : "alias",
 		value ? value : "(null)");
-	purple_debug_info("msn", "passport=%s\n", passport);
 	g_return_if_fail(passport != NULL);
+
 	contact_info = xmlnode_new("contactInfo");
 	changes = xmlnode_new("propertiesChanged");
 
@@ -1451,8 +1452,6 @@
 			g_return_if_reached();
 	}
 
-
-
 	state = msn_callback_state_new(session);
 
 	state->body = xmlnode_from_str(MSN_CONTACT_UPDATE_TEMPLATE, -1);