Browse Source

Update deps and switch to master sdk

merge-requests/1327/merge
Julian Sparber 4 years ago
parent
commit
ad1e5690b5
  1. 646
      Cargo.lock
  2. 3
      Cargo.toml
  3. 2
      src/contrib/qr_code_scanner/camera.rs

646
Cargo.lock generated

File diff suppressed because it is too large Load Diff

3
Cargo.toml

@ -59,8 +59,7 @@ package = "libadwaita"
version = "0.1.0"
[dependencies.matrix-sdk]
git = "https://github.com/jsparber/matrix-rust-sdk.git"
branch = "enable_ruma_unstable_pre_spec"
git = "https://github.com/matrix-org/matrix-rust-sdk.git"
features = [
"socks",
"encryption",

2
src/contrib/qr_code_scanner/camera.rs

@ -54,7 +54,7 @@ impl Camera {
let proxy = camera::CameraProxy::new(&self.connection().await?).await?;
proxy.access_camera().await?;
let stream_fd = proxy.open_pipe_wire_remote().await?;
let node_id = camera::pipewire_node_id(stream_fd).await.ok();
let node_id = camera::pipewire_node_id(stream_fd).await.ok().flatten();
Ok((stream_fd, node_id))
}

Loading…
Cancel
Save