# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1178219784 0
# Node ID eda643d941f134356d85b5fa4bc4322705f2c767
# Parent  a26545a6409e2048e6a2f3151f5203327cb6ccb2# Parent  832c443a392f12488ad10570c6caef09b9180e71
merge of '3fafcf318bcb0b0099bc0ba5781451dd8ce0aa17'
     and 'ad01b5f940bbc213d855edbc346fc5109e9adb67'

diff -r 832c443a392f -r eda643d941f1 COPYRIGHT
--- a/COPYRIGHT	Thu May 03 19:16:16 2007 +0000
+++ b/COPYRIGHT	Thu May 03 19:16:24 2007 +0000
@@ -73,6 +73,7 @@
 Eoin Coffey
 Jason Cohen
 Todd Cohen
+Graham Cole
 Jono Cole
 Lorenzo Colitti
 Jeff Connelly
diff -r 832c443a392f -r eda643d941f1 libpurple/protocols/oscar/oscar.c
--- a/libpurple/protocols/oscar/oscar.c	Thu May 03 19:16:16 2007 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Thu May 03 19:16:24 2007 +0000
@@ -5571,7 +5571,7 @@
 			length = va_arg(ap, int);
 			md5 = va_arg(ap, guchar *);
 
-			if (flags == 0x41) {
+			if ((flags == 0x00) || (flags == 0x41)) {
 				if (!flap_connection_getbytype(od, SNAC_FAMILY_BART) && !od->iconconnecting) {
 					od->iconconnecting = TRUE;
 					od->set_icon = TRUE;