diff -r -du --exclude '*.o' --exclude '*.dep' --exclude '*.depend' gaim-0.61/pixmaps/status/default/Makefile.in gaim-0.61-robey/pixmaps/status/default/Makefile.in
--- gaim-0.61/pixmaps/status/default/Makefile.in        Mon Apr  7 21:10:00 2003
+++ gaim-0.61-robey/pixmaps/status/default/Makefile.in  Thu Apr 17 14:52:47 2003
@@ -127,12 +127,12 @@
 perlpath = @perlpath@
 sedpath = @sedpath@
 
-EXTRA_DIST = login.png logout.png aim.png icq.png msn.png jabber.png yahoo.png gadu-gadu.png napster.png irc.png            activebuddy.png admin.png aol.png away.png wireless.png offline.png             dnd.png freeforchat.png invisible.png na.png occupied.png game.png
+EXTRA_DIST = login.png logout.png aim.png icq.png msn.png jabber.png yahoo.png gadu-gadu.png napster.png irc.png            activebuddy.png admin.png aol.png away.png wireless.png offline.png             dnd.png freeforchat.png invisible.png na.png occupied.png game.png hiptop.png
 
 
 gaimstatuspixdir = $(datadir)/pixmaps/gaim/status/default
 
-gaimstatuspix_DATA = login.png logout.png aim.png icq.png msn.png jabber.png yahoo.png gadu-gadu.png napster.png irc.png                    activebuddy.png admin.png aol.png away.png wireless.png offline.png                     dnd.png freeforchat.png invisible.png na.png occupied.png game.png
+gaimstatuspix_DATA = login.png logout.png aim.png icq.png msn.png jabber.png yahoo.png gadu-gadu.png napster.png irc.png                    activebuddy.png admin.png aol.png away.png wireless.png offline.png                     dnd.png freeforchat.png invisible.png na.png occupied.png game.png hiptop.png
 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../../config.h
diff -r -du --exclude '*.o' --exclude '*.dep' --exclude '*.depend' gaim-0.61/src/protocols/oscar/aim.h gaim-0.61-robey/src/protocols/oscar/aim.h
--- gaim-0.61/src/protocols/oscar/aim.h	Fri Mar 28 21:03:45 2003
+++ gaim-0.61-robey/src/protocols/oscar/aim.h	Wed Apr 16 16:24:34 2003
@@ -986,7 +986,8 @@
 #define AIM_CAPS_TRILLIANCRYPT	0x00010000
 #define AIM_CAPS_ICQUTF8	0x00020000
 #define AIM_CAPS_INTEROPERATE	0x00040000
-#define AIM_CAPS_LAST		0x00080000
+#define AIM_CAPS_HIPTOP		0x00080000
+#define AIM_CAPS_LAST		0x00100000
 
 faim_export int aim_0002_000b(aim_session_t *sess, aim_conn_t *conn, const char *sn);
 
diff -r -du --exclude '*.o' --exclude '*.dep' --exclude '*.depend' gaim-0.61/src/protocols/oscar/info.c gaim-0.61-robey/src/protocols/oscar/info.c
--- gaim-0.61/src/protocols/oscar/info.c	Thu Mar 27 13:41:21 2003
+++ gaim-0.61-robey/src/protocols/oscar/info.c	Wed Apr 16 16:32:55 2003
@@ -350,6 +350,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 -r -du --exclude '*.o' --exclude '*.dep' --exclude '*.depend' gaim-0.61/src/protocols/oscar/oscar.c gaim-0.61-robey/src/protocols/oscar/oscar.c
--- gaim-0.61/src/protocols/oscar/oscar.c	Mon Apr  7 19:24:29 2003
+++ gaim-0.61-robey/src/protocols/oscar/oscar.c	Wed Apr 16 16:28:59 2003
@@ -65,6 +65,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"
 
@@ -1714,6 +1715,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)
@@ -2942,8 +2945,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");
@@ -2997,6 +3001,9 @@
 			case 0x20000:
 				tmp = _("ICQ UTF8");
 				break;
+			case AIM_CAPS_HIPTOP:
+				tmp = _("Hiptop");
+				break;
 			default:
 				tmp = NULL;
 				break;
@@ -5177,6 +5184,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];