Mercurial > pidgin.yaz
changeset 10517:461334f300d7
[gaim-migrate @ 11821]
oscar_can_receive_file was crashing when logging out with a AIM conversation open. Apparently the GaimConnection wasn't NULL, but the proto_data was. There are also a couple little compile warning fixes.
committer: Tailor Script <tailor@pidgin.im>
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Fri, 14 Jan 2005 02:02:43 +0000 |
| parents | d7ca3fa38e05 |
| children | 8ae540ad42e7 |
| files | src/protocols/oscar/oscar.c |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/protocols/oscar/oscar.c Thu Jan 13 23:37:04 2005 +0000 +++ b/src/protocols/oscar/oscar.c Fri Jan 14 02:02:43 2005 +0000 @@ -698,8 +698,8 @@ { OscarData *od; GaimAccount *account; - GaimPresence *presence; - GaimStatus *status; + GaimPresence *presence = NULL; + GaimStatus *status = NULL; GaimGroup *g = NULL; struct buddyinfo *bi = NULL; char *tmp; @@ -2147,7 +2147,7 @@ gboolean can_receive = FALSE; OscarData *od = gc->proto_data; - if (!od->icq) { + if (od != NULL && !od->icq) { aim_userinfo_t *userinfo; userinfo = aim_locate_finduserinfo(od->sess, who); if (userinfo && userinfo->capabilities & AIM_CAPS_SENDFILE)