changeset
merge of 'f72d986c8e3f7cd65a4322aa4ed4c2b650e22cea'
Thu, 03 May 2007 19:16:24 +0000
- author
- Stu Tomlinson <nosnilmot@pidgin.im>
- date
- Thu, 03 May 2007 19:16:24 +0000
- changeset 16887
- 72fcf7e63c95
- parent 16886
- f72d986c8e3f (diff)
- parent 16884
- ca5b441bcc47 (current diff)
- child 16888
- 10ec3eef653e
- child 16891
- 6dfc8fe0eed1
merge of 'f72d986c8e3f7cd65a4322aa4ed4c2b650e22cea'
and 'ca5b441bcc47df2f232c477e2722df255b5a7efe'
--- 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
--- 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;
