Mercurial > pidgin
changeset 27582:db0be613925b
merge of '1f0820a27cb7599cb83182453e1d0cfc9663f11d'
and 'f097092b2172caac2ebaf3c24d14ef9aa874402b'
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Thu, 16 Jul 2009 17:24:39 +0000 |
| parents | a0d2cf22a581 (current diff) 13bacaad01aa (diff) |
| children | 872809a802ba |
| files | |
| diffstat | 1 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/yahoo/yahoochat.c Thu Jul 16 15:30:05 2009 +0000 +++ b/libpurple/protocols/yahoo/yahoochat.c Thu Jul 16 17:24:39 2009 +0000 @@ -160,8 +160,11 @@ who = pair->value; g_string_append_printf(members, "%s\n", who); break; - case 52: /* invitee (me) */ - case 53: /* members */ + case 51: /* This user is being invited to the conference. Comes with status = 11, so we wont reach here */ + break; + case 52: /* Invited users. Assuming us invited, since we got this packet */ + break; /* break needed, or else we add the users to the conference before they accept the invitation */ + case 53: /* members who have already joined the conference */ g_string_append_printf(members, "%s\n", pair->value); break; case 58: