Skip to content

chore: Update dependencies #172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mpobaschnig merged 2 commits into from
Oct 14, 2025
Merged

chore: Update dependencies #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5796fe
chore: Update dependencies
mpobaschnig Oct 6, 2025
a0fb6de
chore: Update dependencies
mpobaschnig Oct 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
402 changes: 230 additions & 172 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ strum = "0.27"
strum_macros = "0.27"
toml = "0.8"
serde = { version = "1.0", features = ["derive"] }
adw = { version = "0.7", package = "libadwaita", features = ["v1_6"] }
gtk = { version = "0.9", package = "gtk4", features = ["v4_14"] }
adw = { version = "0.8", package = "libadwaita", features = ["v1_6"] }
gtk = { version = "0.10", package = "gtk4", features = ["v4_16"] }
proc-mounts = "0.3"
async-channel = "2"
rust-ini = "0.21"
Expand Down
10 changes: 7 additions & 3 deletions src/application.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ use gettextrs::gettext;
use gio::ApplicationFlags;
use glib::clone;
use gtk::gio::Settings;
use gtk::glib::ExitCode;
use gtk::glib::VariantTy;
use gtk::glib::closure_local;
use gtk::glib::{home_dir, user_data_dir};
Expand Down Expand Up @@ -198,7 +199,10 @@ mod imp {
self.parent_startup();
}

fn handle_local_options(&self, options: &glib::VariantDict) -> glib::ExitCode {
fn handle_local_options(
&self,
options: &glib::VariantDict,
) -> std::ops::ControlFlow<ExitCode> {
log::trace!("handle_local_options(...)");

if let Some(vault_name) = options.lookup_value("open", Some(VariantTy::STRING)) {
Expand All @@ -211,14 +215,14 @@ mod imp {
log::debug!("Found close option");
if *self.only_prompt_type.borrow() != OnlyPromptType::None {
log::error!("{}", gettext("Cannot open and close at the same time."));
return glib::ExitCode::from(2);
return std::ops::ControlFlow::Break(ExitCode::FAILURE);
}

*self.only_prompt_type.borrow_mut() = OnlyPromptType::Close;
*self.only_pompt_vault.borrow_mut() = vault_name.get::<String>().unwrap();
}

glib::ExitCode::from(-1)
std::ops::ControlFlow::Continue(())
}
}

Expand Down
6 changes: 3 additions & 3 deletions src/ui/add_new_vault_window.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,15 +143,15 @@ mod imp {
}
}

impl AdwDialogImpl for AddNewVaultWindow {}
impl DialogImpl for AddNewVaultWindow {}
impl WidgetImpl for AddNewVaultWindow {}
impl WindowImpl for AddNewVaultWindow {}
impl AdwDialogImpl for AddNewVaultWindow {}
}

glib::wrapper! {
pub struct AddNewVaultWindow(ObjectSubclass<imp::AddNewVaultWindow>)
@extends gtk::Widget, adw::Dialog, adw::Window, gtk::Window;
@extends gtk::Widget, adw::Dialog, adw::Window, gtk::Window,
@implements gio::ActionMap, gio::ActionGroup, gtk::Accessible, gtk::Native, gtk::Root, gtk::ShortcutManager, gtk::Buildable, gtk::ConstraintTarget;
}

impl Default for AddNewVaultWindow {
Expand Down
6 changes: 3 additions & 3 deletions src/ui/import_vault_window.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,15 +132,15 @@ mod imp {
}
}

impl AdwDialogImpl for ImportVaultDialog {}
impl DialogImpl for ImportVaultDialog {}
impl WidgetImpl for ImportVaultDialog {}
impl WindowImpl for ImportVaultDialog {}
impl AdwDialogImpl for ImportVaultDialog {}
}

glib::wrapper! {
pub struct ImportVaultDialog(ObjectSubclass<imp::ImportVaultDialog>)
@extends gtk::Widget, adw::Dialog, adw::Window, gtk::Window;
@extends gtk::Widget, adw::Dialog, adw::Window, gtk::Window,
@implements gio::ActionMap, gio::ActionGroup, gtk::Accessible, gtk::Native, gtk::Root, gtk::ShortcutManager, gtk::Buildable, gtk::ConstraintTarget;
}

impl Default for ImportVaultDialog {
Expand Down
4 changes: 3 additions & 1 deletion src/ui/pages/vaults_page_row.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,15 @@ mod imp {
SIGNALS.as_ref()
}
}

impl WidgetImpl for VaultsPageRow {}
impl ListBoxRowImpl for VaultsPageRow {}
}

glib::wrapper! {
pub struct VaultsPageRow(ObjectSubclass<imp::VaultsPageRow>)
@extends gtk::Widget, gtk::ListBoxRow;
@extends gtk::Widget, gtk::ListBoxRow,
@implements gtk::Actionable, gtk::Accessible, gtk::Native, gtk::Root, gtk::ShortcutManager, gtk::Buildable, gtk::ConstraintTarget;
}

impl VaultsPageRow {
Expand Down
8 changes: 4 additions & 4 deletions src/ui/pages/vaults_page_row_password_prompt_window.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ use adw::{
prelude::{AdwDialogExt, EntryRowExt},
subclass::prelude::*,
};
use gtk::{self, CompositeTemplate, glib, glib::clone, prelude::*};
use gtk::{self, CompositeTemplate, gio, glib, glib::clone, prelude::*};

mod imp {
use gtk::glib::subclass::Signal;
Expand Down Expand Up @@ -80,15 +80,15 @@ mod imp {
}
}

impl AdwDialogImpl for VaultsPageRowPasswordPromptWindow {}
impl DialogImpl for VaultsPageRowPasswordPromptWindow {}
impl WidgetImpl for VaultsPageRowPasswordPromptWindow {}
impl WindowImpl for VaultsPageRowPasswordPromptWindow {}
impl AdwDialogImpl for VaultsPageRowPasswordPromptWindow {}
}

glib::wrapper! {
pub struct VaultsPageRowPasswordPromptWindow(ObjectSubclass<imp::VaultsPageRowPasswordPromptWindow>)
@extends gtk::Widget, adw::Dialog, adw::Window, gtk::Window;
@extends gtk::Widget, adw::Dialog, adw::Window, gtk::Window,
@implements gio::ActionMap, gio::ActionGroup, gtk::Accessible, gtk::Native, gtk::Root, gtk::ShortcutManager, gtk::Buildable, gtk::ConstraintTarget;
}

impl Default for VaultsPageRowPasswordPromptWindow {
Expand Down
6 changes: 3 additions & 3 deletions src/ui/pages/vaults_page_row_settings_window.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,15 +170,15 @@ mod imp {
}
}

impl AdwDialogImpl for VaultsPageRowSettingsWindow {}
impl DialogImpl for VaultsPageRowSettingsWindow {}
impl WidgetImpl for VaultsPageRowSettingsWindow {}
impl WindowImpl for VaultsPageRowSettingsWindow {}
impl AdwDialogImpl for VaultsPageRowSettingsWindow {}
}

glib::wrapper! {
pub struct VaultsPageRowSettingsWindow(ObjectSubclass<imp::VaultsPageRowSettingsWindow>)
@extends gtk::Widget, adw::Dialog, adw::Window, gtk::Window;
@extends gtk::Widget, adw::Dialog, adw::Window, gtk::Window,
@implements gio::ActionMap, gio::ActionGroup, gtk::Accessible, gtk::Native, gtk::Root, gtk::ShortcutManager, gtk::Buildable, gtk::ConstraintTarget;
}

impl VaultsPageRowSettingsWindow {
Expand Down
3 changes: 2 additions & 1 deletion src/ui/preferences.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@ mod imp {

glib::wrapper! {
pub struct VaultsSettingsWindow(ObjectSubclass<imp::VaultsSettingsWindow>)
@extends gtk::Widget, adw::Dialog, adw::Window, gtk::Window;
@extends gtk::Widget, adw::Dialog, adw::Window, gtk::Window,
@implements gio::ActionMap, gio::ActionGroup, gtk::Accessible, gtk::Native, gtk::Root, gtk::ShortcutManager, gtk::Buildable, gtk::ConstraintTarget;
}

impl Default for VaultsSettingsWindow {
Expand Down
3 changes: 2 additions & 1 deletion src/ui/window.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,8 @@ mod imp {

glib::wrapper! {
pub struct ApplicationWindow(ObjectSubclass<imp::ApplicationWindow>)
@extends gtk::Widget, gtk::Window, gtk::ApplicationWindow, adw::ApplicationWindow, @implements gio::ActionMap, gio::ActionGroup;
@extends gtk::Widget, gtk::Window, gtk::ApplicationWindow, adw::ApplicationWindow,
@implements gio::ActionMap, gio::ActionGroup, gtk::Accessible, gtk::Native, gtk::Root, gtk::ShortcutManager, gtk::Buildable, gtk::ConstraintTarget;
}

impl ApplicationWindow {
Expand Down