Mercurial > pidgin.yaz
diff src/oscar.c @ 445:e4c34ca88d9b
[gaim-migrate @ 455]
Hehehehehe
Libfaim got updated, gaim got updated. btw, gaim/faim can't sign in yet,
don't ask me why. it's not my fault.
committer: Tailor Script <tailor@pidgin.im>
author | Eric Warmenhoven <eric@warmenhoven.org> |
---|---|
date | Thu, 29 Jun 2000 20:40:28 +0000 |
parents | 0d4e80bdb96b |
children | 6d78b988b479 |
line wrap: on
line diff
--- a/src/oscar.c Thu Jun 29 19:38:18 2000 +0000 +++ b/src/oscar.c Thu Jun 29 20:40:28 2000 +0000 @@ -542,10 +542,7 @@ } else if (channel == 2) { struct aim_userinfo_s *userinfo; int rendtype = va_arg(ap, int); - if (rendtype == 0 || - rendtype == AIM_RENDEZVOUS_CHAT_EX3 || - rendtype == AIM_RENDEZVOUS_CHAT_EX4 || - rendtype == AIM_RENDEZVOUS_CHAT_EX5) { + if (rendtype & AIM_CAPS_CHAT) { char *msg, *encoding, *lang; struct aim_chat_roominfo *roominfo; @@ -560,12 +557,15 @@ roominfo->instance, userinfo->sn, msg); - } else if (rendtype == AIM_RENDEZVOUS_FILETRANSFER) { + } else if (rendtype & AIM_CAPS_SENDFILE) { /* libfaim won't tell us that we got this just yet */ - } else if (rendtype == AIM_RENDEZVOUS_FILETRANSFER_GET) { + } else if (rendtype & AIM_CAPS_GETFILE) { /* nor will it tell us this. but it's still there */ - } else if (rendtype == AIM_RENDEZVOUS_VOICE) { + } else if (rendtype & AIM_CAPS_VOICE) { /* this one libfaim tells us unuseful info about */ + } else if (rendtype & AIM_CAPS_BUDDYICON) { + /* bah */ + } else if (rendtype & AIM_CAPS_IMIMAGE) { } else { sprintf(debug_buff, "Unknown rendtype %d\n", rendtype); debug_print(debug_buff); @@ -670,8 +670,11 @@ int gaim_chatnav_info(struct aim_session_t *sess, struct command_rx_struct *command, ...) { - va_list ap = va_start(ap, command); - u_short type = va_arg(ap, u_short); + va_list ap; + u_short type; + + va_start(ap, command); + type = va_arg(ap, u_short); switch(type) { case 0x0002: {