changeset 7141:af8ac078d4c2

[gaim-migrate @ 7708] I guess I changed "everybuddy bug" to "ICQ Direct Connect" in the tooltips. And then there's some other comment changes and stuff that were in my tree. committer: Tailor Script <[e-mail]>

--- a/src/protocols/oscar/aim.h	Sat Oct 04 19:34:53 2003 +0000
+++ b/src/protocols/oscar/aim.h	Sat Oct 04 20:14:25 2003 +0000
@@ -1018,7 +1018,7 @@
 #define AIM_CAPS_SAVESTOCKS		0x00000080
 #define AIM_CAPS_SENDBUDDYLIST	0x00000100
 #define AIM_CAPS_GAMES2			0x00000200
-#define AIM_CAPS_ICQ			0x00000400
+#define AIM_CAPS_ICQ_DIRECT		0x00000400
 #define AIM_CAPS_APINFO			0x00000800
 #define AIM_CAPS_ICQRTF			0x00001000
 #define AIM_CAPS_EMPTY			0x00002000

--- a/src/protocols/oscar/locate.c	Sat Oct 04 19:34:53 2003 +0000
+++ b/src/protocols/oscar/locate.c	Sat Oct 04 20:14:25 2003 +0000
@@ -71,10 +71,7 @@
 	 {0x09, 0x46, 0x13, 0x43, 0x4c, 0x7f, 0x11, 0xd1, 
 	  0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
 
-	/*
-	 * Advertised by the EveryBuddy client.
-	 */
-	{AIM_CAPS_ICQ,
+	{AIM_CAPS_ICQ_DIRECT,
 	 {0x09, 0x46, 0x13, 0x44, 0x4c, 0x7f, 0x11, 0xd1, 
 	  0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}},
 
@@ -494,6 +491,13 @@
 			outinfo->icqinfo.status = aimbs_get16(bs);
 			outinfo->present |= AIM_USERINFO_PRESENT_ICQEXTSTATUS;
 
+		} else if (type == 0x0008) {
+			/*
+			 * Type = 0x0008
+			 *
+			 * Client type, or some such.
+			 */
+
 		} else if (type == 0x000a) {
 			/*
 			 * Type = 0x000a
@@ -523,7 +527,7 @@
 			/*
 			 * Type = 0x000d
 			 *
-			 * Capability information.
+			 * OSCAR Capability information.
 			 *
 			 */
 			outinfo->capabilities = aim_getcap(sess, bs, length);
@@ -533,10 +537,7 @@
 			/*
 			 * Type = 0x000e
 			 *
-			 * Unknown.  Always of zero length, and always only
-			 * on AOL users.
-			 *
-			 * Ignore.
+			 * AOL capability information.
 			 *
 			 */
 
@@ -556,10 +557,27 @@
 			outinfo->present |= AIM_USERINFO_PRESENT_SESSIONLEN;
 
 		} else if (type == 0x0019) {
-/*			faimdprintf(sess, 0, "userinfo: **warning: unexpected TLV type 0x0019: from %s\n", outinfo->sn); */
+			/*
+			 * Type = 0x0019
+			 *
+			 * OSCAR short capability information.  A shortened 
+			 * form of the normal capabilities.
+			 */
 
 		} else if (type == 0x001b) {
-/*			faimdprintf(sess, 0, "userinfo: **warning: unexpected TLV type 0x001b: from %s\n", outinfo->sn); */
+			/*
+			 * Type = 0x001a
+			 *
+			 * AOL short capability information.  A shortened 
+			 * form of the normal capabilities.
+			 */
+
+		} else if (type == 0x001b) {
+			/*
+			 * Type = 0x0019
+			 *
+			 * Encryption certification MD5 checksum.
+			 */
 
 		} else if (type == 0x001d) {
 			/*

--- a/src/protocols/oscar/oscar.c	Sat Oct 04 19:34:53 2003 +0000
+++ b/src/protocols/oscar/oscar.c	Sat Oct 04 20:14:25 2003 +0000
@@ -1776,8 +1776,8 @@
 		}
 	}
 
-	if (caps & AIM_CAPS_ICQ)
-		caps ^= AIM_CAPS_ICQ;
+	if (caps & AIM_CAPS_ICQ_DIRECT)
+		caps ^= AIM_CAPS_ICQ_DIRECT;
 
 	if (info->present & AIM_USERINFO_PRESENT_IDLE) {
 		time(&time_idle);
@@ -3011,8 +3011,13 @@
 	return 1;
 }
 
+/*
+ * We get this error when there was an error in the locate family.  This 
+ * usually happens because libfaim couldn't get info for someone when it 
+ * tried automatically.  Seeing the message gets annoying...
+ */
 static int gaim_parse_locerr(aim_session_t *sess, aim_frame_t *fr, ...) {
-	char *buf;
+	/* char *buf; */
 	va_list ap;
 	fu16_t reason;
 	char *destn;
@@ -3022,10 +3027,12 @@
 	destn = va_arg(ap, char *);
 	va_end(ap);
 
+	/*
 	buf = g_strdup_printf(_("User information for %s unavailable:"), destn);
 	gaim_notify_error(sess->aux_data, NULL, buf,
 					  (reason < msgerrreasonlen) ? _(msgerrreason[reason]) : _("No reason given."));
 	g_free(buf);
+	*/
 
 	return 1;
 }
@@ -3063,7 +3070,7 @@
 				tmp = _("Voice");
 				break;
 			case AIM_CAPS_DIRECTIM:
-				tmp = _("Direct IM");
+				tmp = _("AIM Direct IM");
 				break;
 			case AIM_CAPS_CHAT:
 				tmp = _("Chat");
@@ -3084,8 +3091,8 @@
 			case AIM_CAPS_SENDBUDDYLIST:
 				tmp = _("Send Buddy List");
 				break;
-			case AIM_CAPS_ICQ:
-				tmp = _("EveryBuddy Bug");
+			case AIM_CAPS_ICQ_DIRECT:
+				tmp = _("ICQ Direct Connect");
 				break;
 			case AIM_CAPS_APINFO:
 				tmp = _("AP User");

--- a/src/protocols/oscar/service.c	Sat Oct 04 19:34:53 2003 +0000
+++ b/src/protocols/oscar/service.c	Sat Oct 04 20:14:25 2003 +0000
@@ -787,15 +787,15 @@
 	if (!sess || !(conn = aim_conn_findbygroup(sess, 0x0001)))
 		return -EINVAL;
 
-	if (msg) {
+	if (msg != NULL) {
 		if (!(fr = aim_tx_new(sess, conn, AIM_FRAMETYPE_FLAP, 0x02, 10 + 4 + strlen(msg) + 8)))
 			return -ENOMEM;
 
 		snacid = aim_cachesnac(sess, 0x0001, 0x001e, 0x0000, NULL, 0);
 		aim_putsnac(&fr->data, 0x0001, 0x001e, 0x0000, snacid);
 
-		aimbs_put16(&fr->data, 0x001d);
-		aimbs_put16(&fr->data, strlen(msg)+8);
+		aimbs_put16(&fr->data, 0x001d); /* userinfo TLV type */
+		aimbs_put16(&fr->data, strlen(msg)+8); /* total length of userinfo TLV data */
 		aimbs_put16(&fr->data, 0x0002);
 		aimbs_put8(&fr->data, 0x04);
 		aimbs_put8(&fr->data, strlen(msg)+4);