diff -ruN gaim-0.66/pixmaps/status/default/Makefile.in gaim-0.66-robey/pixmaps/status/default/Makefile.in --- gaim-0.66/pixmaps/status/default/Makefile.in Fri Jul 18 08:16:45 2003 +++ gaim-0.66-robey/pixmaps/status/default/Makefile.in Thu Jul 24 16:24:37 2003 @@ -144,7 +144,7 @@ extendedaway.png female.png freeforchat.png gadu-gadu.png \ game.png icq.png invisible.png irc.png jabber.png login.png \ logout.png male.png msn.png na.png napster.png notauthorized.png \ - occupied.png offline.png trepia.png wireless.png yahoo.png + occupied.png offline.png trepia.png wireless.png yahoo.png hiptop.png gaimstatuspixdir = $(datadir)/pixmaps/gaim/status/default diff -ruN gaim-0.66/src/protocols/oscar/aim.h gaim-0.66-robey/src/protocols/oscar/aim.h --- gaim-0.66/src/protocols/oscar/aim.h Thu Jul 17 18:36:41 2003 +++ gaim-0.66-robey/src/protocols/oscar/aim.h Thu Jul 24 16:25:32 2003 @@ -1010,7 +1010,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); diff -ruN gaim-0.66/src/protocols/oscar/info.c gaim-0.66-robey/src/protocols/oscar/info.c --- gaim-0.66/src/protocols/oscar/info.c Sun Jul 13 13:36:53 2003 +++ gaim-0.66-robey/src/protocols/oscar/info.c Thu Jul 24 16:24:00 2003 @@ -354,6 +354,10 @@ {0xf2, 0xe7, 0xc7, 0xf4, 0xfe, 0xad, 0x4d, 0xfb, 0xb2, 0x35, 0x36, 0x79, 0x8b, 0xdf, 0x00, 0x00}}, + {AIM_CAPS_HIPTOP, + {0x09, 0x46, 0x13, 0x23, 0x4c, 0x7f, 0x11, 0xd1, + 0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}}, + {AIM_CAPS_EMPTY, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}, diff -ruN gaim-0.66/src/protocols/oscar/oscar.c gaim-0.66-robey/src/protocols/oscar/oscar.c --- gaim-0.66/src/protocols/oscar/oscar.c Wed Jul 16 22:06:30 2003 +++ gaim-0.66-robey/src/protocols/oscar/oscar.c Thu Jul 24 16:24:00 2003 @@ -50,6 +50,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" @@ -1758,6 +1759,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) @@ -3063,8 +3066,9 @@ if (!caps) { return NULL; - } else while (bit <= 0x20000) { + } else while (bit < AIM_CAPS_LAST) { if (bit & caps) { + /* FIXME: these bits should use AIM_CAPS_* macros */ switch (bit) { case 0x1: tmp = _("Buddy Icon"); @@ -3118,6 +3122,9 @@ case 0x20000: tmp = _("ICQ UTF8"); break; + case AIM_CAPS_HIPTOP: + tmp = _("Hiptop"); + break; default: tmp = NULL; break; @@ -5371,6 +5378,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];