comparison libpurple/protocols/jabber/jabber.c @ 25587:3b674151cd60

*** Plucked rev 4831edb9 ([e-mail]): Don't call jabber_parser_close_stream in jabber_close, it papers over a real issue.

25586:f424f26dd329

	js->unregistration_user_data = user_data;

	jabber_unregister_account_cb(js);
}

void jabber_close(PurpleConnection *gc)
{
	JabberStream *js = gc->proto_data;

	/* Don't perform any actions on the ssl connection
	 * if we were forcibly disconnected because it will crash
	 * on some SSL backends.
	 */
	if (!gc->disconnect_timeout)
		jabber_send_raw(js, "</stream:stream>", -1);

	if (!purple_account_get_current_error(purple_connection_get_account(gc))) {
		/*
		 * The common case is user-triggered, so we never receive a
		 * </stream:stream> from the server when disconnecting, so silence the
		 * parser's warnings. On errors, though, the server terminated the
		 * connection, so we should have received a real </stream:stream>.
		 */
		jabber_parser_close_stream(js);
	}

	if (js->srv_query_data)
		purple_srv_cancel(js->srv_query_data);

	if(js->gsc) {

25587:3b674151cd60

	js->unregistration_user_data = user_data;

	jabber_unregister_account_cb(js);
}

/* TODO: As Will pointed out in IRC, after being notified by the core to
 * shutdown, we should async. wait for the server to send us the stream
 * termination before destorying everything. That seems like it would require
 * changing the semantics of prpl->close(), so it's a good idea for 3.0.0.
 */
void jabber_close(PurpleConnection *gc)
{
	JabberStream *js = gc->proto_data;

	/* Don't perform any actions on the ssl connection
	 * if we were forcibly disconnected because it will crash
	 * on some SSL backends.
	 */
	if (!gc->disconnect_timeout)
		jabber_send_raw(js, "</stream:stream>", -1);

	if (js->srv_query_data)
		purple_srv_cancel(js->srv_query_data);

	if(js->gsc) {