comparison src/protocols/jabber/presence.c @ 7124:be4ca65b3b48

[gaim-migrate @ 7691] jabber password changing, and some other fix I forgot I made. committer: Tailor Script <[e-mail]>

7123:d40966338ea6

				gaim_conv_chat_add_user(GAIM_CONV_CHAT(chat->conv), jid->resource,
						NULL);
		}
		g_free(room_jid);
	} else {
		if(!(jb->subscription & JABBER_SUB_TO)) {
			gaim_debug(GAIM_DEBUG_INFO, "jabber",
					"got unexpected presence from %s, ignoring\n", from);
			jabber_id_free(jid);
			return;
		}

7124:be4ca65b3b48

				gaim_conv_chat_add_user(GAIM_CONV_CHAT(chat->conv), jid->resource,
						NULL);
		}
		g_free(room_jid);
	} else {
		if(state != JABBER_STATE_ERROR && !(jb->subscription & JABBER_SUB_TO)) {
			gaim_debug(GAIM_DEBUG_INFO, "jabber",
					"got unexpected presence from %s, ignoring\n", from);
			jabber_id_free(jid);
			return;
		}