pidgin: a8e4e84c: Don't crash is passport is NULL on Windo...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: a8e4e84ce253f2fb43245d2722cb73ab86e0f9b5
Ancestor: d88831199cb010e3856ff07fccd05fc6be6b1e72
Author: qulogic at pidgin.im
Date: 2009-10-03T20:01:35
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/a8e4e84ce253f2fb43245d2722cb73ab86e0f9b5

Modified files:
        libpurple/protocols/msn/contact.c

ChangeLog: 

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.

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/contact.c	10a5a149c566379fd44484dd6b84eb841cbc2f16
+++ libpurple/protocols/msn/contact.c	43a2b59cd3bd3765824068ed83d8dc0e3d989667
@@ -1418,11 +1418,12 @@ msn_update_contact(MsnSession *session, 
 	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 @@ msn_update_contact(MsnSession *session, 
 			g_return_if_reached();
 	}
 
-
-
 	state = msn_callback_state_new(session);
 
 	state->body = xmlnode_from_str(MSN_CONTACT_UPDATE_TEMPLATE, -1);