Mercurial > pidgin
changeset 18553:9816af55f45c
merge of '16545633f55b708a351f38a9532d94b0b00eacec'
and 'be582d1ac8a250870b9c691a8cb1ab4c170650bc'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Mon, 16 Jul 2007 23:50:41 +0000 |
| parents | 619d195052ba (current diff) 2f99cf09d912 (diff) |
| children | ab58b55f38b0 |
| files | |
| diffstat | 2 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/msn/notification.c Mon Jul 16 23:47:26 2007 +0000 +++ b/libpurple/protocols/msn/notification.c Mon Jul 16 23:50:41 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);
--- a/libpurple/protocols/oscar/family_locate.c Mon Jul 16 23:47:26 2007 +0000 +++ b/libpurple/protocols/oscar/family_locate.c Mon Jul 16 23:50:41 2007 +0000 @@ -1264,10 +1264,13 @@ * this buddy's info explicitly, then notify them that we have info * for this buddy. */ - was_explicit = aim_locate_gotuserinfo(od, conn, userinfo2->sn); - if (was_explicit == TRUE) - if ((userfunc = aim_callhandler(od, snac->family, snac->subtype))) - ret = userfunc(od, conn, frame, userinfo2); + if (userinfo2 != NULL) + { + was_explicit = aim_locate_gotuserinfo(od, conn, userinfo2->sn); + if (was_explicit == TRUE) + if ((userfunc = aim_callhandler(od, snac->family, snac->subtype))) + ret = userfunc(od, conn, frame, userinfo2); + } return ret; }