Mercurial > pidgin
changeset 18551:d5cf2c466e9a
merge of '01d1a63fe1ad7ad2f78ff88c6540afd927693362'
and 'd4c3811d8ca7f9e02be6a9ea4b3eba0d251d4c9a'
| author | Evan Schoenberg <evan.s@dreskin.net> |
|---|---|
| date | Mon, 16 Jul 2007 21:11:23 +0000 |
| parents | 84d184163805 (current diff) 925ba3e6831c (diff) |
| children | 2f99cf09d912 |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/msn/notification.c Sun Jul 15 22:09:03 2007 +0000 +++ b/libpurple/protocols/msn/notification.c Mon Jul 16 21:11:23 2007 +0000 @@ -705,7 +705,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);