build: Update dependencies and fix warnings

Cargo.toml

@@ -5,26 +5,26 @@ authors = ["Marco Melorio <[email protected]>", "Marcus Behrendt <mar
 edition = "2021"
 
 [dependencies]
-adw = { version = "0.6", package = "libadwaita", features = ["v1_5"] }
+adw = { version = "0.7", package = "libadwaita", features = ["v1_6"] }
 anyhow = "1"
 async-channel = "2"
 ellipse = "0.2"
 futures = { version = "0.3", default-features = false }
-gettext-rs = { version = "0.7", features = ["gettext-system"] }
-gtk = { version = "0.8", package = "gtk4", features = ["gnome_45", "blueprint"] }
+gettext-rs = { version = "=0.7.0", features = ["gettext-system"] }
+gtk = { version = "0.9", package = "gtk4", features = ["gnome_47", "blueprint"] }
 image = { version = "0.25", default-features = false, features = ["jpeg", "png", "webp"] }
 indexmap = "2"
 locale_config = "0.3"
 log = "0.4"
-ori = { git = "https://github.com/paper-plane-developers/origami.git", tag="v0.8.1", package = "origami" }
+ori = { git = "https://github.com/paper-plane-developers/origami.git", tag="v0.9.0", package = "origami" }
 pretty_env_logger = "0.5"
-qrcode-generator = { version = "4", default-features = false }
+qrcode-generator = { version = "5", default-features = false }
 regex = "1"
-rlt = { package = "gtk-rlottie", git = "https://github.com/paper-plane-developers/gtk-rlottie-rs.git", tag = "v0.8.1" }
-shumate = { version = "0.5", package = "libshumate" }
+rlt = { git = "https://github.com/paper-plane-developers/gtk-rlottie-rs.git", tag = "v0.9.0", package = "gtk-rlottie" }
+shumate = { version = "0.6", package = "libshumate" }
 tdlib = { version = "0.10", default-features = false }
 temp-dir = "0.1"
-thiserror = "1"
+thiserror = "2"
 
 [profile.release]
 lto = true

build-aux/app.drey.PaperPlane.Devel.json

@@ -1,11 +1,11 @@
 {
     "id": "app.drey.PaperPlane.Devel",
     "runtime": "org.gnome.Platform",
-    "runtime-version": "46",
+    "runtime-version": "47",
     "sdk": "org.gnome.Sdk",
     "sdk-extensions": [
         "org.freedesktop.Sdk.Extension.rust-stable",
-        "org.freedesktop.Sdk.Extension.llvm16"
+        "org.freedesktop.Sdk.Extension.llvm18"
     ],
     "command": "paper-plane",
     "finish-args": [
@@ -18,7 +18,7 @@
         "--env=RUST_BACKTRACE=1"
     ],
     "build-options": {
-        "append-path": "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm16/bin:/app/bin",
+        "append-path": "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm18/bin:/app/bin",
         "env": {
             "CARGO_REGISTRIES_CRATES_IO_PROTOCOL": "sparse",
             "CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER": "clang",
@@ -67,7 +67,6 @@
             "name": "gtk",
             "buildsystem": "meson",
             "config-opts": [
-                "-Dvulkan=disabled",
                 "-Dintrospection=disabled",
                 "-Dbuild-demos=false",
                 "-Dbuild-testsuite=false",
@@ -78,7 +77,7 @@
                 {
                     "type": "git",
                     "url": "https://gitlab.gnome.org/GNOME/gtk.git",
-                    "tag": "4.14.4"
+                    "tag": "4.16.12"
                 },
                 {
                     "type": "patch",
@@ -146,13 +145,15 @@
                 "-Dgir=false",
                 "-Dvapi=false",
                 "-Dgtk_doc=false",
+                "-Ddemos=false",
+                "-Dvector_renderer=false",
                 "-Dsysprof=disabled"
             ],
             "sources": [
                 {
                     "type": "git",
                     "url": "https://gitlab.gnome.org/GNOME/libshumate/",
-                    "tag": "1.1.4"
+                    "tag": "1.3.1"
                 }
             ]
         },

src/application.rs

@@ -1,5 +1,6 @@
 use std::cell::OnceCell;
 
+use adw::prelude::AdwDialogExt;
 use adw::subclass::prelude::*;
 use gettextrs::gettext;
 use glib::clone;
@@ -97,44 +98,64 @@ impl Application {
     fn setup_gactions(&self) {
         // Quit
         let action_quit = gio::SimpleAction::new("quit", None);
-        action_quit.connect_activate(clone!(@weak self as app => move |_, _| {
-            // This is needed to trigger the delete event and saving the window state
-            app.main_window().close();
-            app.quit();
-        }));
+        action_quit.connect_activate(clone!(
+            #[weak(rename_to = app)]
+            self,
+            move |_, _| {
+                // This is needed to trigger the delete event and saving the window state
+                app.main_window().close();
+                app.quit();
+            }
+        ));
         self.add_action(&action_quit);
 
         // About
         let action_about = gio::SimpleAction::new("about", None);
-        action_about.connect_activate(clone!(@weak self as app => move |_, _| {
-            app.show_about_dialog();
-        }));
+        action_about.connect_activate(clone!(
+            #[weak(rename_to = app)]
+            self,
+            move |_, _| {
+                app.show_about_dialog();
+            }
+        ));
         self.add_action(&action_about);
 
         // Select chat
         let action_select_chat =
             gio::SimpleAction::new("select-chat", Some(glib::VariantTy::new("(ix)").unwrap()));
-        action_select_chat.connect_activate(clone!(@weak self as app => move |_, data| {
-            let (client_id, chat_id) = data.unwrap().get().unwrap();
-            app.main_window().select_chat(client_id, chat_id);
-        }));
+        action_select_chat.connect_activate(clone!(
+            #[weak(rename_to = app)]
+            self,
+            move |_, data| {
+                let (client_id, chat_id) = data.unwrap().get().unwrap();
+                app.main_window().select_chat(client_id, chat_id);
+            }
+        ));
         self.add_action(&action_select_chat);
 
         // New login on production server
         let action_new_login_production_server =
             gio::SimpleAction::new("new-login-production-server", None);
-        action_new_login_production_server.connect_activate(
-            clone!(@weak self as app => move |_, _| {
-                app.main_window().client_manager_view().add_new_client(false);
-            }),
-        );
+        action_new_login_production_server.connect_activate(clone!(
+            #[weak(rename_to = app)]
+            self,
+            move |_, _| {
+                app.main_window()
+                    .client_manager_view()
+                    .add_new_client(false);
+            }
+        ));
         self.add_action(&action_new_login_production_server);
 
         // New login on test server
         let action_new_login_test_server = gio::SimpleAction::new("new-login-test-server", None);
-        action_new_login_test_server.connect_activate(clone!(@weak self as app => move |_, _| {
-            app.main_window().client_manager_view().add_new_client(true);
-        }));
+        action_new_login_test_server.connect_activate(clone!(
+            #[weak(rename_to = app)]
+            self,
+            move |_, _| {
+                app.main_window().client_manager_view().add_new_client(true);
+            }
+        ));
         self.add_action(&action_new_login_test_server);
     }
 
@@ -154,8 +175,7 @@ impl Application {
     }
 
     fn show_about_dialog(&self) {
-        let about = adw::AboutWindow::builder()
-            .transient_for(&self.main_window())
+        let about = adw::AboutDialog::builder()
             .application_name("Paper Plane")
             .application_icon(config::APP_ID)
             .version(config::VERSION)
@@ -201,6 +221,6 @@ impl Application {
             )),
         );
 
-        about.present();
+        about.present(Some(&self.main_window()));
     }
 }

src/meson.build

@@ -72,7 +72,7 @@ test (
   ],
   env: [
     'CARGO_HOME=@0@'.format(cargo_home),
-    'PATH=/app/bin:/usr/bin:/usr/lib/sdk/llvm16/bin:/usr/lib/sdk/rust-stable/bin',
+    'PATH=/app/bin:/usr/bin:/usr/lib/sdk/llvm18/bin:/usr/lib/sdk/rust-stable/bin',
   ],
   timeout: 300, # Give cargo more time
 )

src/model/chat_history_model.rs

@@ -88,12 +88,20 @@ impl ChatHistoryModel {
 
         obj.imp().chat.set(Some(chat));
 
-        chat.connect_new_message(clone!(@weak obj => move |_, message| {
-            obj.push_front(message);
-        }));
-        chat.connect_deleted_message(clone!(@weak obj => move |_, message| {
-            obj.remove(message);
-        }));
+        chat.connect_new_message(clone!(
+            #[weak]
+            obj,
+            move |_, message| {
+                obj.push_front(message);
+            }
+        ));
+        chat.connect_deleted_message(clone!(
+            #[weak]
+            obj,
+            move |_, message| {
+                obj.remove(message);
+            }
+        ));
 
         obj
     }

src/model/chat_list.rs

@@ -142,19 +142,27 @@ impl ChatList {
     }
 
     pub(crate) fn fetch(&self) {
-        utils::spawn(clone!(@weak self as obj => async move {
-            let result = tdlib::functions::load_chats(Some(obj.list_type().0), 20, obj.session_().client_().id())
+        utils::spawn(clone!(
+            #[weak(rename_to = obj)]
+            self,
+            async move {
+                let result = tdlib::functions::load_chats(
+                    Some(obj.list_type().0),
+                    20,
+                    obj.session_().client_().id(),
+                )
                 .await;
 
-            if let Err(err) = result {
-                // Error 404 means that all chats have been loaded
-                if err.code != 404 {
-                    log::error!("Received an error for LoadChats: {}", err.code);
+                if let Err(err) = result {
+                    // Error 404 means that all chats have been loaded
+                    if err.code != 404 {
+                        log::error!("Received an error for LoadChats: {}", err.code);
+                    }
+                } else {
+                    obj.fetch();
                 }
-            } else {
-                obj.fetch();
             }
-        }));
+        ));
     }
 
     pub(crate) fn update_chat_position(

src/model/client.rs

@@ -68,9 +68,13 @@ mod imp {
 
             let obj = &*self.obj();
 
-            utils::spawn(clone!(@weak obj => async move {
-                obj.init().await;
-            }));
+            utils::spawn(clone!(
+                #[weak]
+                obj,
+                async move {
+                    obj.init().await;
+                }
+            ));
             obj.set_state(model::ClientStateAuth::from(obj).upcast());
         }
     }
@@ -256,26 +260,36 @@ impl Client {
         match update {
             Update::AuthorizationState(state) => match state.authorization_state {
                 AuthorizationState::WaitTdlibParameters => {
-                    utils::spawn(clone!(@weak self as obj => async move {
-                        if let Err(e) = obj.send_tdlib_parameters().await {
-                            log::error!("Failed sensing tdlib parameters: {e:?}");
+                    utils::spawn(clone!(
+                        #[weak(rename_to = obj)]
+                        self,
+                        async move {
+                            if let Err(e) = obj.send_tdlib_parameters().await {
+                                log::error!("Failed sensing tdlib parameters: {e:?}");
+                            }
                         }
-                    }));
+                    ));
                 }
                 AuthorizationState::Ready => {
-                    utils::spawn(clone!(@weak self as obj => async move {
-                        let tdlib::enums::User::User(me) =
-                            tdlib::functions::get_me(obj.id()).await.unwrap();
-
-                        let state = model::ClientStateSession::new(&obj, me);
-                        while let Some(update) = obj.imp().queued_updates.borrow_mut().pop_front() {
-                            state.handle_update(update);
+                    utils::spawn(clone!(
+                        #[weak(rename_to = obj)]
+                        self,
+                        async move {
+                            let tdlib::enums::User::User(me) =
+                                tdlib::functions::get_me(obj.id()).await.unwrap();
+
+                            let state = model::ClientStateSession::new(&obj, me);
+                            while let Some(update) =
+                                obj.imp().queued_updates.borrow_mut().pop_front()
+                            {
+                                state.handle_update(update);
+                            }
+
+                            obj.set_state(state.upcast());
+
+                            obj.client_manager_().on_client_logged_in(&obj);
                         }
-
-                        obj.set_state(state.upcast());
-
-                        obj.client_manager_().on_client_logged_in(&obj);
-                    }));
+                    ));
                 }
                 AuthorizationState::Closing => {
                     self.set_state(model::ClientStateLoggingOut::default().upcast());

src/model/client_manager.rs

@@ -267,17 +267,23 @@ impl ClientManager {
 
     fn start_tdlib_thread(&self) {
         let (sender, receiver) = async_channel::unbounded();
-        glib::spawn_future_local(clone!(@weak self as obj => async move {
-            while let Ok((update, client_id)) = receiver.recv().await {
-                obj.handle_update(update, client_id);
+        glib::spawn_future_local(clone!(
+            #[weak(rename_to = obj)]
+            self,
+            async move {
+                while let Ok((update, client_id)) = receiver.recv().await {
+                    obj.handle_update(update, client_id);
+                }
             }
-        }));
+        ));
 
         thread::spawn(move || loop {
             if let Some((update, client_id)) = tdlib::receive() {
-                glib::spawn_future(clone!(@strong sender => async move {
-                    _ = sender.send((update, client_id)).await;
-                }));
+                glib::spawn_future(clone!(
+                    #[strong]
+                    sender,
+                    async move { _ = sender.send((update, client_id)).await }
+                ));
             }
         });
     }