diff --git a/Cargo.lock b/Cargo.lock index 4fc48a9..26a5e79 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -831,8 +831,7 @@ dependencies = [ [[package]] name = "glycin" version = "2.1.0-beta" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a0156b1f142e88a923d8e122bbacc7ae893a9da975771ea8c4db33cf7a5a317" +source = "git+https://gitlab.gnome.org/GNOME/glycin.git?rev=08d7799d6c29c544bfe6914d4e7921bbbeb5f3ff#08d7799d6c29c544bfe6914d4e7921bbbeb5f3ff" dependencies = [ "async-fs", "async-io", @@ -863,8 +862,7 @@ dependencies = [ [[package]] name = "glycin-utils" version = "3.0.0-beta" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be81f5ab01eec2fe54b24ab58f2c435275684916c3842b1157cd7351e07caa2" +source = "git+https://gitlab.gnome.org/GNOME/glycin.git?rev=08d7799d6c29c544bfe6914d4e7921bbbeb5f3ff#08d7799d6c29c544bfe6914d4e7921bbbeb5f3ff" dependencies = [ "env_logger", "gufo-common", diff --git a/Cargo.toml b/Cargo.toml index 41c8a7d..be93841 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,9 @@ chrono = { version = "0.4.38", default-features = false, features = ["std"] } gettext-rs = { version = "0.7.0", features = ["gettext-system"] } gettext-sys = { version = "0.22.5", features = ["gettext-system"] } gio = { version = "0.20.0", features = ["v2_74"] } -glycin = { version = "2.1.0-beta", features = ["gdk4"] } +glycin = { version = "2.1.0-beta", features = [ + "gdk4", +], git = "https://gitlab.gnome.org/GNOME/glycin.git", rev = "08d7799d6c29c544bfe6914d4e7921bbbeb5f3ff" } gtk = { package = "gtk4", version = "0.9.5", features = [ "v4_14", "xml_validation", diff --git a/build-aux/flatpak/org.gnome.Loupe.Devel.json b/build-aux/flatpak/org.gnome.Loupe.Devel.json index ae6a5b0..5a1d9d7 100644 --- a/build-aux/flatpak/org.gnome.Loupe.Devel.json +++ b/build-aux/flatpak/org.gnome.Loupe.Devel.json @@ -113,7 +113,7 @@ { "type": "git", "url": "https://gitlab.gnome.org/GNOME/glycin.git", - "commit": "52fe5cdb68abf24361ce31c88c2965bd6c203460" + "commit": "08d7799d6c29c544bfe6914d4e7921bbbeb5f3ff" } ] }, diff --git a/src/widgets/edit_window.rs b/src/widgets/edit_window.rs index 5e9a7c8..7bc36b3 100644 --- a/src/widgets/edit_window.rs +++ b/src/widgets/edit_window.rs @@ -351,6 +351,9 @@ mod imp { log::debug!("Computing edited image."); let result = editor.apply_complete(&operations).await; match result { + Err(err) if matches!(err.error(), glycin::Error::Canceled(_)) => { + log::debug!("Computing edited image canceled"); + } Err(err) => { log::warn!("Failed to edit image: {err}"); obj.window().show_error( diff --git a/src/widgets/error_details.rs b/src/widgets/error_details.rs index a9dafee..5dd7aac 100644 --- a/src/widgets/error_details.rs +++ b/src/widgets/error_details.rs @@ -1,5 +1,4 @@ // Copyright (c) 2024-2025 Sophie Herold -// Copyright (c) 2025 Rafael Fontenelle // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by