Update to gtk-rs 0.9

Cargo.toml

@@ -14,11 +14,11 @@ opt-level = 1
 opt-level = 3
 
 [dependencies]
-adw = {package = "libadwaita", version = "0.6", features = ["v1_5"]}
+adw = {package = "libadwaita", version = "0.7", features = ["v1_5"]}
 aes-gcm = "0.10"
 anyhow = "1.0"
-aperture = "0.6"
-ashpd = {version = "0.8", default-features = false, features = ["gtk4", "tokio", "tracing"]}
+aperture = "0.7"
+ashpd = {version = "0.9", default-features = false, features = ["gtk4", "tokio", "tracing"]}
 data-encoding = "2.3"
 diesel = {version = "2.0", features = ["sqlite", "r2d2"]}
 diesel_migrations = {version = "2.0", features = ["sqlite"]}
@@ -27,7 +27,7 @@ futures-channel = "0.3"
 futures-executor = "0.3"
 futures-util = "0.3"
 gettext-rs = {version = "0.7", features = ["gettext-system"]}
-gtk = {package = "gtk4", version = "0.8", features = ["v4_10"]}
+gtk = {package = "gtk4", version = "0.9", features = ["v4_10"]}
 hex = {version = "0.4.3", features = ["serde"]}
 image = {version = "0.25", default-features = false, features = ["png"]}
 once_cell = "1.9"

src/application.rs

@@ -79,7 +79,7 @@ mod imp {
                     preferences.connect_has_set_password_notify(clone!(@weak app => move |pref| {
                         app.set_can_be_locked(pref.has_set_password());
                     }));
-                    preferences.present(&window);
+                    preferences.present(Some(&window));
                 }).build();
 
             // About
@@ -102,7 +102,7 @@ mod imp {
                         .application_icon(config::APP_ID)
                         .license_type(gtk::License::Gpl30)
                         .build()
-                        .present(&window);
+                        .present(Some(&window));
                 })
                 .build();
 
@@ -114,7 +114,7 @@ mod imp {
                     providers.connect_changed(clone!(@weak window => move |_| {
                         window.providers().refilter();
                     }));
-                    providers.present(&window);
+                    providers.present(Some(&window));
                 })
                 .build();
 

src/widgets/accounts/add.rs

@@ -192,7 +192,7 @@ impl AccountAddDialog {
 
         let name_entry = imp.provider_page.name_entry();
         name_entry.set_text(&entry.text());
-        name_entry.set_position(entry.cursor_position());
+        name_entry.set_position(entry.position());
     }
 
     #[template_callback]

src/widgets/accounts/details.rs

@@ -136,7 +136,7 @@ impl AccountDetailsPage {
             }),
         );
 
-        dialog.present(&parent);
+        dialog.present(Some(&parent));
     }
 
     pub fn set_account(&self, account: &Account) {

src/widgets/providers/image.rs

@@ -96,7 +96,7 @@ mod imp {
                 provider.disconnect(signal_id);
             }
 
-            self.image.set_from_icon_name(Some("provider-fallback"));
+            self.image.set_icon_name(Some("provider-fallback"));
         }
     }
 }
@@ -114,7 +114,7 @@ impl ProviderImage {
                 // Very dirty hack to store that we couldn't find an icon
                 // to avoid re-hitting the website every time we have to display it
                 if uri == "invalid" {
-                    imp.image.set_from_icon_name(Some("provider-fallback"));
+                    imp.image.set_icon_name(Some("provider-fallback"));
                     imp.stack.set_visible_child_name("image");
                     return;
                 }
@@ -146,7 +146,7 @@ impl ProviderImage {
         if (network_monitor.is_network_metered() && !SETTINGS.download_favicons_metered())
             || !SETTINGS.download_favicons()
         {
-            imp.image.set_from_icon_name(Some("provider-fallback"));
+            imp.image.set_icon_name(Some("provider-fallback"));
             imp.stack.set_visible_child_name("image");
             return;
         }
@@ -181,7 +181,7 @@ impl ProviderImage {
                     let image_path = match receiver.await {
                         // TODO: handle network failure and other errors differently
                         Ok(None) => {
-                            imp.image.set_from_icon_name(Some("provider-fallback"));
+                            imp.image.set_icon_name(Some("provider-fallback"));
                             "invalid".to_string()
                         }
                         Ok(Some(cache_name)) => {
@@ -212,9 +212,7 @@ impl ProviderImage {
     }
 
     pub fn reset(&self) {
-        self.imp()
-            .image
-            .set_from_icon_name(Some("provider-fallback"));
+        self.imp().image.set_icon_name(Some("provider-fallback"));
         self.fetch();
     }
 

src/widgets/window.rs

@@ -277,7 +277,7 @@ impl Window {
         dialog.connect_added(clone!(@weak self as win => move |_| {
             win.providers().refilter();
         }));
-        dialog.present(self);
+        dialog.present(Some(self));
     }
 
     pub fn providers(&self) -> ProvidersList {