comparison libpurple/protocols/oscar/flap_connection.c @ 23607:3b3d7039bc8e

Daniel Atallah pointed out that this was obviously wrong. So we would have leaked a struct containing info about a chat if the connection to the chatroom failed for any reason, or if you signed offline while the connection was pending. All better!

23606:bdb38a8bf721

	{
		purple_proxy_connect_cancel(conn->connect_data);
		conn->connect_data = NULL;
	}

	if (conn->connect_data != NULL)
	{
		if (conn->type == SNAC_FAMILY_CHAT)
		{
			oscar_chat_destroy(conn->new_conn_data);
			conn->connect_data = NULL;

23607:3b3d7039bc8e

	{
		purple_proxy_connect_cancel(conn->connect_data);
		conn->connect_data = NULL;
	}

	if (conn->new_conn_data != NULL)
	{
		if (conn->type == SNAC_FAMILY_CHAT)
		{
			oscar_chat_destroy(conn->new_conn_data);
			conn->connect_data = NULL;