[Gaim-commits] CVS: gaim/src/protocols/oscar aim.h,1.103,1.104 info.c,1.37,1.38 oscar.c,1.420,1.421

[Mark D. <the...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/oscar
In directory sc8-pr-cvs1:/tmp/cvs-serv10689/src/protocols/oscar

Modified Files:
	aim.h info.c oscar.c 
Log Message:
How now, brown cow?


Index: aim.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/aim.h,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- aim.h	24 Jul 2003 02:04:19 -0000	1.103
+++ aim.h	28 Jul 2003 02:52:23 -0000	1.104
@@ -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);
 

Index: info.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/info.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- info.c	24 Jul 2003 02:04:19 -0000	1.37
+++ info.c	28 Jul 2003 02:52:23 -0000	1.38
@@ -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));

Index: oscar.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/oscar/oscar.c,v
retrieving revision 1.420
retrieving revision 1.421
diff -u -d -r1.420 -r1.421
--- oscar.c	26 Jul 2003 20:40:44 -0000	1.420
+++ oscar.c	28 Jul 2003 02:52:23 -0000	1.421
@@ -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];