# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1041301641 0
# Node ID 3468d666d3ccdb73acf742751ae1fc1d978a52ac
# Parent  76b8bbe8ed34b86b0d8088c515a73451fe15139d
[gaim-migrate @ 4382]
The buddy pounce thing bothered me.

The oscar changes are basically nothing.  I just like things to be clean.

By the way, if you know of any projects using libfaim other than fire,
please let me know.  I'm muy muy curious.  Messa Jar Jar Binks.  I guess
emailing me at mark@kingant.net is the most effective way.

Squiggle squiggle

committer: Tailor Script <tailor@pidgin.im>

diff -r 76b8bbe8ed34 -r 3468d666d3cc src/buddy.c
--- a/src/buddy.c	Tue Dec 31 00:42:00 2002 +0000
+++ b/src/buddy.c	Tue Dec 31 02:27:21 2002 +0000
@@ -1724,7 +1724,10 @@
 		gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), messmenu);
 		gtk_widget_show(menuitem);
 
-		mess = gtk_menu_item_new_with_label(b->message);
+		if (strlen(b->message))
+			mess = gtk_menu_item_new_with_label(b->message);
+		else
+			mess = gtk_menu_item_new_with_label("[no message]");
 		gtk_menu_append(GTK_MENU(messmenu), mess);
 		gtk_tooltips_set_tip(bp_tooltip, GTK_WIDGET(mess), _("[Click to edit]"), NULL);
 		gtk_widget_show(mess);
diff -r 76b8bbe8ed34 -r 3468d666d3cc src/protocols/oscar/icq.c
--- a/src/protocols/oscar/icq.c	Tue Dec 31 00:42:00 2002 +0000
+++ b/src/protocols/oscar/icq.c	Tue Dec 31 02:27:21 2002 +0000
@@ -307,6 +307,7 @@
 			info->first = aimbs_getstr(&qbs, aimbs_getle16(&qbs));
 			info->last = aimbs_getstr(&qbs, aimbs_getle16(&qbs));
 			info->email = aimbs_getstr(&qbs, aimbs_getle16(&qbs));
+			/* Then 0x00 02 00 00 00 00 00 */
 		} break;
 		} /* End switch statement */
 
diff -r 76b8bbe8ed34 -r 3468d666d3cc src/protocols/oscar/im.c
--- a/src/protocols/oscar/im.c	Tue Dec 31 00:42:00 2002 +0000
+++ b/src/protocols/oscar/im.c	Tue Dec 31 02:27:21 2002 +0000
@@ -897,10 +897,7 @@
 		{ /* V */
 			aimbs_putle16(&fr->data, 0x001b); /* L */
 			aimbs_putle16(&fr->data, 0x0008); /* XXX - Protocol version */
-			aimbs_putle32(&fr->data, 0x00000000); /* Unknown */
-			aimbs_putle32(&fr->data, 0x00000000); /* Unknown */
-			aimbs_putle32(&fr->data, 0x00000000); /* Unknown */
-			aimbs_putle32(&fr->data, 0x00000000); /* Unknown */
+			aim_putcap(&fr->data, AIM_CAPS_EMPTY);
 			aimbs_putle16(&fr->data, 0x0000); /* Unknown */
 			aimbs_putle16(&fr->data, 0x0003); /* Client features? */
 			aimbs_putle16(&fr->data, 0x0000); /* Unknown */
@@ -927,8 +924,8 @@
 
 			aimbs_putle16(&fr->data, 0x0000); /* Status? */
 			aimbs_putle16(&fr->data, 0x0001); /* Priority of this message? */
-			aimbs_putle16(&fr->data, 0x0001); /* L? */
-			aimbs_putle8(&fr->data, 0x00); /* Null termination? */
+			aimbs_putle16(&fr->data, 0x0001); /* L */
+			aimbs_putle8(&fr->data, 0x00); /* String of length L */
 		} /* End TLV t(2711) */
 	} /* End TLV t(0005) */
 
diff -r 76b8bbe8ed34 -r 3468d666d3cc src/protocols/oscar/oscar.c
--- a/src/protocols/oscar/oscar.c	Tue Dec 31 00:42:00 2002 +0000
+++ b/src/protocols/oscar/oscar.c	Tue Dec 31 02:27:21 2002 +0000
@@ -93,7 +93,7 @@
 
 /* Set AIM caps, because Gaim can still do them over ICQ and 
  * Winicq doesn't mind. */
-static int caps_icq = AIM_CAPS_CHAT | AIM_CAPS_BUDDYICON | AIM_CAPS_IMIMAGE;
+static int caps_icq = AIM_CAPS_BUDDYICON | AIM_CAPS_IMIMAGE | AIM_CAPS_SENDFILE;
 /* static int caps_icq = AIM_CAPS_ICQ; */
 /* What does AIM_CAPS_ICQ actually mean? -SE */