Mercurial > pidgin
changeset 16834:eda643d941f1
merge of '3fafcf318bcb0b0099bc0ba5781451dd8ce0aa17'
and 'ad01b5f940bbc213d855edbc346fc5109e9adb67'
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Thu, 03 May 2007 19:16:24 +0000 |
| parents | a26545a6409e (diff) 832c443a392f (current diff) |
| children | 4d8e7fd6e14d f3874ba27a27 |
| files | |
| diffstat | 2 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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;