# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1247765079 0
# Node ID db0be613925b8e0241ac6d45dbf106e203c42455
# Parent  a0d2cf22a581ee7cd1b51dddfdda97844affec13# Parent  13bacaad01aa48f899360d4ab95c4f5bb16b4f76
merge of '1f0820a27cb7599cb83182453e1d0cfc9663f11d'
     and 'f097092b2172caac2ebaf3c24d14ef9aa874402b'

diff -r a0d2cf22a581 -r db0be613925b libpurple/protocols/yahoo/yahoochat.c
--- 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: