1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
|
From: =?utf-8?q?Jeremy_B=C3=ADcha?= <jbicha@debian.org>
Date: Sun, 14 Sep 2025 23:34:19 -0400
Subject: Revert "Run cargo clippy --fix"
This reverts commit 0906600e8c0b55034e21d9e5f072cbc0bdb1be09.
---
src/widgets/camera_page.rs | 13 +++++++------
src/widgets/window.rs | 36 ++++++++++++++++++------------------
2 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/src/widgets/camera_page.rs b/src/widgets/camera_page.rs
index c2004b8..160586f 100644
--- a/src/widgets/camera_page.rs
+++ b/src/widgets/camera_page.rs
@@ -181,13 +181,14 @@ impl CameraPage {
async move {
let imp = camera.imp();
- if let Err(err) = camera.try_start_stream().await
- && let Some(Portal(PortalError::NotAllowed(err))) =
+ if let Err(err) = camera.try_start_stream().await {
+ if let Some(Portal(PortalError::NotAllowed(err))) =
err.downcast_ref::<ashpd::Error>()
- {
- imp.portal_failed.set(true);
- camera.update_state();
- tracing::debug!("Missing portal permission for camera: {err}");
+ {
+ imp.portal_failed.set(true);
+ camera.update_state();
+ tracing::debug!("Missing portal permission for camera: {}", err);
+ }
}
}
));
diff --git a/src/widgets/window.rs b/src/widgets/window.rs
index 9010238..7f0efa2 100644
--- a/src/widgets/window.rs
+++ b/src/widgets/window.rs
@@ -136,26 +136,26 @@ mod imp {
#[upgrade_or]
false,
move |_, value, _, _| {
- if let Ok(file_list) = value.get::<gdk::FileList>()
- && let Some(file) = file_list.files().first()
- {
- match utils::scan(file) {
- Ok(code) => {
- glib::spawn_future_local(glib::clone!(
- #[weak]
- obj,
- async move {
- if let Err(err) = obj.show_code_detected(&code).await {
- tracing::error!(
- "Could not show code {}: {err:?}",
- &code
- );
+ if let Ok(file_list) = value.get::<gdk::FileList>() {
+ if let Some(file) = file_list.files().first() {
+ match utils::scan(file) {
+ Ok(code) => {
+ glib::spawn_future_local(glib::clone!(
+ #[weak]
+ obj,
+ async move {
+ if let Err(err) = obj.show_code_detected(&code).await {
+ tracing::error!(
+ "Could not show code {}: {err:?}",
+ &code
+ );
+ }
}
- }
- ));
- return true;
+ ));
+ return true;
+ }
+ Err(err) => tracing::error!("Could not open file: {err:?}"),
}
- Err(err) => tracing::error!("Could not open file: {err:?}"),
}
}
false
|
