Update all dependencies
This commit is contained in:
@ -6,6 +6,6 @@ edition = "2021"
|
||||
[dependencies]
|
||||
anyhow = "1"
|
||||
bscreensaver-util = { path = "../util" }
|
||||
glib = "0.15"
|
||||
gtk = { version = "0.15", features = ["v3_20"] }
|
||||
glib = "0.18"
|
||||
gtk = "0.18"
|
||||
log = "0.4"
|
||||
|
@ -1,5 +1,5 @@
|
||||
use gtk::{glib, prelude::*};
|
||||
use glib::clone;
|
||||
use glib::{clone, Propagation::{Proceed, Stop}};
|
||||
use log::warn;
|
||||
use std::{env, process::exit, time::Duration, ffi::CString};
|
||||
|
||||
@ -31,7 +31,7 @@ fn main() -> anyhow::Result<()> {
|
||||
.build();
|
||||
app.connect_activate(move |app| show_ui(&app, &config));
|
||||
|
||||
exit(app.run_with_args(&env::args().into_iter().collect::<Vec<String>>()));
|
||||
exit(app.run_with_args(&env::args().into_iter().collect::<Vec<String>>()).into());
|
||||
}
|
||||
|
||||
fn show_ui(app: >k::Application, config: &Configuration) {
|
||||
@ -226,7 +226,11 @@ fn show_ui(app: >k::Application, config: &Configuration) {
|
||||
handle_brightness_keys_checkbox: handle_brightness_keys_checkbox.clone(),
|
||||
};
|
||||
mainwin.connect_delete_event(clone!(@strong config, @strong widgets, @strong app, @strong mainwin => move |_,_| {
|
||||
Inhibit(!confirm_cancel(&config, &widgets, &mainwin))
|
||||
if !confirm_cancel(&config, &widgets, &mainwin) {
|
||||
Stop
|
||||
} else {
|
||||
Proceed
|
||||
}
|
||||
}));
|
||||
custom_new_login_command_button.connect_clicked(clone!(@strong mainwin, @strong widgets => move |_| {
|
||||
run_file_chooser(&mainwin, &widgets);
|
||||
|
Reference in New Issue
Block a user