Mercurial > pidgin
diff libpurple/protocols/msn/contact.c @ 20892:bbcc9e206c43
propagate from branch 'im.pidgin.pidgin' (head f33ba0034c79d8e37a70d664ec534356fa361608)
to branch 'im.pidgin.cpw.resiak.disconnectreason' (head b3c8182bd741b961775afed0768fbecdc47dc828)
| author | Will Thompson <will.thompson@collabora.co.uk> |
|---|---|
| date | Fri, 12 Oct 2007 00:19:12 +0000 |
| parents | 871a67790848 cfaf74ec93dc |
| children | ba41f2a60253 |
line wrap: on
line diff
--- a/libpurple/protocols/msn/contact.c Thu Oct 11 23:55:13 2007 +0000 +++ b/libpurple/protocols/msn/contact.c Fri Oct 12 00:19:12 2007 +0000 @@ -1177,7 +1177,7 @@ purple_debug_warning("MSN CL", "Unable to retrieve user %s from the userlist!\n", passport); } - if (user->uid != NULL) { + if (user != NULL && user->uid != NULL) { contact_xml = g_strdup_printf(MSN_CONTACT_ID_XML, user->uid); } else { contact_xml = g_strdup_printf(MSN_CONTACT_XML, passport);