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
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
|
From: Maximiliano Sandoval <msandova@gnome.org>
Date: Sun, 14 Jul 2024 12:29:57 +0200
Subject: cargo: Update to gtk4-rs 0.9
(cherry picked from commit 0a12c33dcfb5d0774c3d331d5d2b74ac7149b396)
Origin: upstream, after 3.0.1
---
Cargo.toml | 8 ++++----
src/actions.rs | 6 +++---
src/app.rs | 6 +++---
src/ui/about_dialog.rs | 2 +-
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
index a2a44a2..9d49791 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,7 +7,7 @@ license = "GPL-3.0-or-later"
[dependencies]
anyhow = "1.0"
-ashpd = { version = "0.8", features = ["gtk4"] }
+ashpd = { version = "0.9", features = ["gtk4"] }
async-process = "2.2"
async-recursion = "1.1"
base64 = "0.22"
@@ -30,11 +30,11 @@ strum_macros = "0.26"
url = "2.5"
uuid = { version = "1.10", features = ["v4"] }
-gtk = { package = "gtk4", version = "0.8", features = ["gnome_45"] }
-adw = { package = "libadwaita", version = "0.6", features = ["v1_5"] }
+gtk = { package = "gtk4", version = "0.9", features = ["gnome_47"] }
+adw = { package = "libadwaita", version = "0.7", features = ["v1_6"] }
[dependencies.transmission-gobject]
-version = "0.1.5"
+version = "0.1.6"
#path = "./src/transmission-gobject"
#git = "https://gitlab.gnome.org/haecker-felix/transmission-gobject"
diff --git a/src/actions.rs b/src/actions.rs
index 44218a1..1f4211a 100644
--- a/src/actions.rs
+++ b/src/actions.rs
@@ -123,7 +123,7 @@ pub fn install_torrent_actions(torrent: &TrTorrent, widget: gtk::Widget) {
let show_dialog_action = SimpleAction::new("show-dialog", None);
show_dialog_action.connect_activate(clone!(@weak torrent, @weak widget => move |_, _| {
let dialog = FrgTorrentDialog::new(&torrent);
- dialog.present(&widget);
+ dialog.present(Some(&widget));
}));
actions.add_action(&show_dialog_action);
@@ -300,7 +300,7 @@ fn show_remove_torrent_dialog(torrent: &TrTorrent, parent: gtk::Widget) {
}),
);
- dialog.present(&parent);
+ dialog.present(Some(&parent));
}
// TODO: Consider rewriting this as async to get rid of the nested closures
@@ -327,7 +327,7 @@ fn show_set_torrent_location(torrent: &TrTorrent, parent: >k::Widget) {
dialog.set_default_response(Some("move-data"));
dialog.set_response_appearance("move-data", adw::ResponseAppearance::Suggested);
- dialog.present(&parent);
+ dialog.present(Some(&parent));
dialog.connect_response(
None,
clone!(@strong dialog, @strong torrent, @strong folder => move |_ , resp| {
diff --git a/src/app.rs b/src/app.rs
index f599bb4..992a547 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -189,7 +189,7 @@ mod imp {
// app.show-stats
let action = gio::SimpleAction::new("show-stats", None);
action.connect_activate(clone!(@weak window => move |_, _| {
- FrgStatsDialog::new().present(&window);
+ FrgStatsDialog::new().present(Some(&window));
}));
utils::bind_connected_property(&action);
obj.add_action(&action);
@@ -218,14 +218,14 @@ mod imp {
let action = gio::SimpleAction::new("add-remote-connection", None);
action.connect_activate(clone!(@weak window => move |_, _| {
let dialog = FrgAddConnectionDialog::new();
- dialog.present(&window);
+ dialog.present(Some(&window));
}));
obj.add_action(&action);
// app.show-preferences
let action = gio::SimpleAction::new("show-preferences", None);
action.connect_activate(clone!(@weak window => move |_, _| {
- FrgPreferencesDialog::default().present(&window);
+ FrgPreferencesDialog::default().present(Some(&window));
}));
obj.set_accels_for_action("app.show-preferences", &["<primary>comma"]);
obj.add_action(&action);
diff --git a/src/ui/about_dialog.rs b/src/ui/about_dialog.rs
index e11abad..d505ec9 100644
--- a/src/ui/about_dialog.rs
+++ b/src/ui/about_dialog.rs
@@ -43,5 +43,5 @@ pub fn show(parent: &FrgApplicationWindow) {
dialog.set_designers(&["Tobias Bernard", "Jakub Steiner", "Sam Hewitt"]);
dialog.set_translator_credits(&i18n("translator-credits"));
- dialog.present(parent);
+ dialog.present(Some(parent));
}
|
