# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1047548607 0
# Node ID 636568ab1b4dd806463e05e911aabfb369b6edf6
# Parent  dbd0761f8814384ab274b1877ea7630ef04a70a7
[gaim-migrate @ 5057]
Man I'd like to make a special case for her lack of capability
advertisement.

committer: Tailor Script <tailor@pidgin.im>

diff -r dbd0761f8814 -r 636568ab1b4d src/protocols/oscar/oscar.c
--- a/src/protocols/oscar/oscar.c	Thu Mar 13 09:32:07 2003 +0000
+++ b/src/protocols/oscar/oscar.c	Thu Mar 13 09:43:27 2003 +0000
@@ -76,12 +76,7 @@
 G_MODULE_IMPORT GSList *groups;
 
 static int caps_aim = AIM_CAPS_CHAT | AIM_CAPS_BUDDYICON | AIM_CAPS_IMIMAGE | AIM_CAPS_SENDFILE;
-
-/* Set AIM caps, because Gaim can still do them over ICQ and 
- * Winicq doesn't mind. */
 static int caps_icq = AIM_CAPS_BUDDYICON | AIM_CAPS_IMIMAGE | AIM_CAPS_SENDFILE | AIM_CAPS_ICQUTF8;
-/* static int caps_icq = AIM_CAPS_ICQ; */
-/* What does AIM_CAPS_ICQ actually mean? -SE */
 
 static fu8_t features_aim[] = {0x01, 0x01, 0x01, 0x02};
 static fu8_t features_icq[] = {0x01, 0x06};
@@ -2788,7 +2783,10 @@
 	static char buf[512], *tmp;
 	int count = 0, i = 0;
 	guint bit = 1;
-	while (bit <= 0x10000) {
+
+	if (!caps) {
+		strncpy(buf, _("<i>none advertised</i>"), sizeof(buf));
+	} else while (bit <= 0x10000) {
 		if (bit & caps) {
 			switch (bit) {
 			case 0x1:
@@ -2840,6 +2838,9 @@
 			case 0x10000:
 				tmp = _("Trillian Encryption");
 				break;
+			case 0x20000:
+				tmp = _("ICQ UTF8");
+				break;
 			default:
 				tmp = NULL;
 				break;