Mercurial > pidgin.yaz
changeset 6318:96196cfb132e
[gaim-migrate @ 6817]
How now, brown cow?
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Mon, 28 Jul 2003 02:52:23 +0000 |
| parents | 285444815c6a |
| children | 2c9b9d51bec2 |
| files | src/protocols/oscar/aim.h src/protocols/oscar/info.c src/protocols/oscar/oscar.c |
| diffstat | 3 files changed, 16 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/protocols/oscar/aim.h Sun Jul 27 22:13:36 2003 +0000 +++ b/src/protocols/oscar/aim.h Mon Jul 28 02:52:23 2003 +0000 @@ -1012,7 +1012,8 @@ #define AIM_CAPS_ICQUTF8 0x00020000 #define AIM_CAPS_INTEROPERATE 0x00040000 #define AIM_CAPS_ICHAT 0x00080000 -#define AIM_CAPS_LAST 0x00100000 +#define AIM_CAPS_HIPTOP 0x00100000 +#define AIM_CAPS_LAST 0x00200000 faim_export int aim_0002_000b(aim_session_t *sess, aim_conn_t *conn, const char *sn);
--- a/src/protocols/oscar/info.c Sun Jul 27 22:13:36 2003 +0000 +++ b/src/protocols/oscar/info.c Mon Jul 28 02:52:23 2003 +0000 @@ -248,6 +248,10 @@ {0x09, 0x46, 0x00, 0x00, 0x4c, 0x7f, 0x11, 0xd1, 0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}}, + {AIM_CAPS_HIPTOP, + {0x09, 0x46, 0x13, 0x23, 0x4c, 0x7f, 0x11, 0xd1, + 0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}}, + {AIM_CAPS_VOICE, {0x09, 0x46, 0x13, 0x41, 0x4c, 0x7f, 0x11, 0xd1, 0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}}, @@ -693,7 +697,7 @@ if (length2 > 4) { free(outinfo->availmsg); outinfo->availmsg_len = aimbs_get16(bs); - outinfo->availmsg = aimbs_getraw(bs, outinfo->availmsg_len); + outinfo->availmsg = aimbs_getstr(bs, outinfo->availmsg_len); if (aimbs_get16(bs) == 0x0001) { /* We have an encoding */ aimbs_get16(bs); outinfo->availmsg_encoding = aimbs_getstr(bs, aimbs_get16(bs));
--- a/src/protocols/oscar/oscar.c Sun Jul 27 22:13:36 2003 +0000 +++ b/src/protocols/oscar/oscar.c Mon Jul 28 02:52:23 2003 +0000 @@ -54,6 +54,7 @@ #define UC_NORMAL 0x10 #define UC_AB 0x20 #define UC_WIRELESS 0x40 +#define UC_HIPTOP 0x80 #define AIMHASHDATA "http://gaim.sourceforge.net/aim_data.php3" @@ -1759,6 +1760,8 @@ caps = info->capabilities; if (info->flags & AIM_FLAG_ACTIVEBUDDY) type |= UC_AB; + if (caps & AIM_CAPS_HIPTOP) + type |= UC_HIPTOP; if (info->present & AIM_USERINFO_PRESENT_FLAGS) { if (info->flags & AIM_FLAG_UNCONFIRMED) @@ -3071,7 +3074,7 @@ if (!caps) { return NULL; - } else while (bit <= 0x20000) { + } else while (bit <= AIM_CAPS_LAST) { if (bit & caps) { switch (bit) { case 0x1: @@ -3126,6 +3129,9 @@ case 0x20000: tmp = _("ICQ UTF8"); break; + case AIM_CAPS_HIPTOP: + tmp = _("Hiptop"); + break; default: tmp = NULL; break; @@ -5395,6 +5401,8 @@ emblems[i++] = "admin"; if (b->uc & UC_AB && i < 4) emblems[i++] = "activebuddy"; + if (b->uc & UC_HIPTOP && i < 4) + emblems[i++] = "hiptop"; /* if (b->uc & UC_UNCONFIRMED && i < 4) emblems[i++] = "unconfirmed"; */ *se = emblems[0];