Mercurial > pidgin
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 20823:f33ed41b6dee | 20892:bbcc9e206c43 |
|---|---|
| 1175 user = msn_userlist_find_user(userlist, passport); | 1175 user = msn_userlist_find_user(userlist, passport); |
| 1176 if (user == NULL) { | 1176 if (user == NULL) { |
| 1177 purple_debug_warning("MSN CL", "Unable to retrieve user %s from the userlist!\n", passport); | 1177 purple_debug_warning("MSN CL", "Unable to retrieve user %s from the userlist!\n", passport); |
| 1178 } | 1178 } |
| 1179 | 1179 |
| 1180 if (user->uid != NULL) { | 1180 if (user != NULL && user->uid != NULL) { |
| 1181 contact_xml = g_strdup_printf(MSN_CONTACT_ID_XML, user->uid); | 1181 contact_xml = g_strdup_printf(MSN_CONTACT_ID_XML, user->uid); |
| 1182 } else { | 1182 } else { |
| 1183 contact_xml = g_strdup_printf(MSN_CONTACT_XML, passport); | 1183 contact_xml = g_strdup_printf(MSN_CONTACT_XML, passport); |
| 1184 } | 1184 } |
| 1185 | 1185 |