Mercurial > pidgin.yaz
diff libpurple/protocols/msn/notification.c @ 20470:7d6f247f08d9
propagate from branch 'im.pidgin.pidgin' (head be582d1ac8a250870b9c691a8cb1ab4c170650bc)
to branch 'im.pidgin.cpw.khc.msnp14' (head 02e228232108b82dfaf51b2bd5daabeab692c0b0)
| author | Carlos Silva <typ0@pidgin.im> |
|---|---|
| date | Mon, 16 Jul 2007 23:06:21 +0000 |
| parents | b888c2f15c79 925ba3e6831c |
| children | 530a92d50c5e |
line wrap: on
line diff
--- a/libpurple/protocols/msn/notification.c Sat Jul 14 18:36:34 2007 +0000 +++ b/libpurple/protocols/msn/notification.c Mon Jul 16 23:06:21 2007 +0000 @@ -1045,7 +1045,7 @@ user = msn_userlist_find_user(session->userlist, passport); old_friendly = msn_user_get_friendly_name(user); - if (!old_friendly || (old_friendly && strcmp(old_friendly, friendly))) + if (!old_friendly || (old_friendly && (!friendly || strcmp(old_friendly, friendly)))) { serv_got_alias(gc, passport, friendly); msn_user_set_friendly_name(user, friendly);