mirror of
https://gitlab.gnome.org/World/Authenticator
synced 2024-07-02 15:49:01 +00:00
cargo: Update deps
Allows to drop unwraps on get_text from an editable.
This commit is contained in:
Maximiliano Sandoval R
parent
8e0927036b
commit
981ebfd83d
81
Cargo.lock
generated
81
Cargo.lock
generated
|
|
@ -414,7 +414,7 @@ checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba"
|
|||
[[package]]
|
||||
name = "cairo-rs"
|
||||
version = "0.13.0"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs#c58fab4fec1254244f598c4eac7f9310184c5996"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs#9c8a48bf11ccfdceab98aefff9b30dfd58b59bb8"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"cairo-sys-rs",
|
||||
|
|
@ -427,7 +427,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "cairo-sys-rs"
|
||||
version = "0.13.0"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs#c58fab4fec1254244f598c4eac7f9310184c5996"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs#9c8a48bf11ccfdceab98aefff9b30dfd58b59bb8"
|
||||
dependencies = [
|
||||
"glib-sys",
|
||||
"libc",
|
||||
|
|
@ -649,9 +649,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "data-encoding"
|
||||
version = "2.3.1"
|
||||
version = "2.3.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "993a608597367c6377b258c25d7120740f00ed23a2252b729b1932dd7866f908"
|
||||
checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57"
|
||||
|
||||
[[package]]
|
||||
name = "deflate"
|
||||
|
|
@ -985,7 +985,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "gdk-pixbuf"
|
||||
version = "0.13.0"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs#c58fab4fec1254244f598c4eac7f9310184c5996"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs#9c8a48bf11ccfdceab98aefff9b30dfd58b59bb8"
|
||||
dependencies = [
|
||||
"gdk-pixbuf-sys",
|
||||
"gio",
|
||||
|
|
@ -996,7 +996,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "gdk-pixbuf-sys"
|
||||
version = "0.13.0"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs#c58fab4fec1254244f598c4eac7f9310184c5996"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs#9c8a48bf11ccfdceab98aefff9b30dfd58b59bb8"
|
||||
dependencies = [
|
||||
"gio-sys",
|
||||
"glib-sys",
|
||||
|
|
@ -1008,7 +1008,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "gdk4"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/gtk-rs/gtk4-rs#e0cbea57b99e5a9b3b617589d5ff137806edd3b5"
|
||||
source = "git+https://github.com/gtk-rs/gtk4-rs#abea0c9980bc083494eceb30dfab5eeb99a73118"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"cairo-rs",
|
||||
|
|
@ -1023,7 +1023,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "gdk4-sys"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/gtk-rs/gtk4-rs#e0cbea57b99e5a9b3b617589d5ff137806edd3b5"
|
||||
source = "git+https://github.com/gtk-rs/gtk4-rs#abea0c9980bc083494eceb30dfab5eeb99a73118"
|
||||
dependencies = [
|
||||
"cairo-sys-rs",
|
||||
"gdk-pixbuf-sys",
|
||||
|
|
@ -1038,7 +1038,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "gdk4-wayland"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/gtk-rs/gtk4-rs#e0cbea57b99e5a9b3b617589d5ff137806edd3b5"
|
||||
source = "git+https://github.com/gtk-rs/gtk4-rs#abea0c9980bc083494eceb30dfab5eeb99a73118"
|
||||
dependencies = [
|
||||
"gdk4",
|
||||
"gdk4-wayland-sys",
|
||||
|
|
@ -1051,7 +1051,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "gdk4-wayland-sys"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/gtk-rs/gtk4-rs#e0cbea57b99e5a9b3b617589d5ff137806edd3b5"
|
||||
source = "git+https://github.com/gtk-rs/gtk4-rs#abea0c9980bc083494eceb30dfab5eeb99a73118"
|
||||
dependencies = [
|
||||
"glib-sys",
|
||||
"libc",
|
||||
|
|
@ -1061,7 +1061,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "gdk4-x11"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/gtk-rs/gtk4-rs#e0cbea57b99e5a9b3b617589d5ff137806edd3b5"
|
||||
source = "git+https://github.com/gtk-rs/gtk4-rs#abea0c9980bc083494eceb30dfab5eeb99a73118"
|
||||
dependencies = [
|
||||
"gdk4",
|
||||
"gdk4-x11-sys",
|
||||
|
|
@ -1074,7 +1074,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "gdk4-x11-sys"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/gtk-rs/gtk4-rs#e0cbea57b99e5a9b3b617589d5ff137806edd3b5"
|
||||
source = "git+https://github.com/gtk-rs/gtk4-rs#abea0c9980bc083494eceb30dfab5eeb99a73118"
|
||||
dependencies = [
|
||||
"gdk4-sys",
|
||||
"glib-sys",
|
||||
|
|
@ -1112,7 +1112,7 @@ checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8"
|
|||
dependencies = [
|
||||
"cfg-if 1.0.0",
|
||||
"libc",
|
||||
"wasi 0.10.1+wasi-snapshot-preview1",
|
||||
"wasi 0.10.2+wasi-snapshot-preview1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
|
|
@ -1157,7 +1157,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "gio"
|
||||
version = "0.13.0"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs#c58fab4fec1254244f598c4eac7f9310184c5996"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs#9c8a48bf11ccfdceab98aefff9b30dfd58b59bb8"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"futures-channel",
|
||||
|
|
@ -1173,7 +1173,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "gio-sys"
|
||||
version = "0.13.0"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs#c58fab4fec1254244f598c4eac7f9310184c5996"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs#9c8a48bf11ccfdceab98aefff9b30dfd58b59bb8"
|
||||
dependencies = [
|
||||
"glib-sys",
|
||||
"gobject-sys",
|
||||
|
|
@ -1185,7 +1185,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "glib"
|
||||
version = "0.13.0"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs#c58fab4fec1254244f598c4eac7f9310184c5996"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs#9c8a48bf11ccfdceab98aefff9b30dfd58b59bb8"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"futures-channel",
|
||||
|
|
@ -1203,7 +1203,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "glib-macros"
|
||||
version = "0.13.0"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs#c58fab4fec1254244f598c4eac7f9310184c5996"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs#9c8a48bf11ccfdceab98aefff9b30dfd58b59bb8"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"heck",
|
||||
|
|
@ -1218,7 +1218,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "glib-sys"
|
||||
version = "0.13.0"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs#c58fab4fec1254244f598c4eac7f9310184c5996"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs#9c8a48bf11ccfdceab98aefff9b30dfd58b59bb8"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"system-deps",
|
||||
|
|
@ -1240,7 +1240,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "gobject-sys"
|
||||
version = "0.13.0"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs#c58fab4fec1254244f598c4eac7f9310184c5996"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs#9c8a48bf11ccfdceab98aefff9b30dfd58b59bb8"
|
||||
dependencies = [
|
||||
"glib-sys",
|
||||
"libc",
|
||||
|
|
@ -1250,7 +1250,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "graphene-rs"
|
||||
version = "0.13.0"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs#c58fab4fec1254244f598c4eac7f9310184c5996"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs#9c8a48bf11ccfdceab98aefff9b30dfd58b59bb8"
|
||||
dependencies = [
|
||||
"glib",
|
||||
"graphene-sys",
|
||||
|
|
@ -1260,7 +1260,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "graphene-sys"
|
||||
version = "0.13.0"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs#c58fab4fec1254244f598c4eac7f9310184c5996"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs#9c8a48bf11ccfdceab98aefff9b30dfd58b59bb8"
|
||||
dependencies = [
|
||||
"glib-sys",
|
||||
"libc",
|
||||
|
|
@ -1271,7 +1271,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "gsk4"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/gtk-rs/gtk4-rs#e0cbea57b99e5a9b3b617589d5ff137806edd3b5"
|
||||
source = "git+https://github.com/gtk-rs/gtk4-rs#abea0c9980bc083494eceb30dfab5eeb99a73118"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"cairo-rs",
|
||||
|
|
@ -1286,7 +1286,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "gsk4-sys"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/gtk-rs/gtk4-rs#e0cbea57b99e5a9b3b617589d5ff137806edd3b5"
|
||||
source = "git+https://github.com/gtk-rs/gtk4-rs#abea0c9980bc083494eceb30dfab5eeb99a73118"
|
||||
dependencies = [
|
||||
"cairo-sys-rs",
|
||||
"gdk4-sys",
|
||||
|
|
@ -1301,7 +1301,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "gstreamer"
|
||||
version = "0.17.0"
|
||||
source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#0e8b95f1d029530ad3f84a3f08a20d8dfd80a089"
|
||||
source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#796f93f7f45c7dc387ce49305154d29a4f511110"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"cfg-if 1.0.0",
|
||||
|
|
@ -1312,6 +1312,7 @@ dependencies = [
|
|||
"gstreamer-sys",
|
||||
"libc",
|
||||
"muldiv",
|
||||
"num-integer",
|
||||
"num-rational",
|
||||
"once_cell",
|
||||
"paste",
|
||||
|
|
@ -1322,7 +1323,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "gstreamer-base"
|
||||
version = "0.17.0"
|
||||
source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#0e8b95f1d029530ad3f84a3f08a20d8dfd80a089"
|
||||
source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#796f93f7f45c7dc387ce49305154d29a4f511110"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"cfg-if 1.0.0",
|
||||
|
|
@ -1335,7 +1336,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "gstreamer-base-sys"
|
||||
version = "0.17.0"
|
||||
source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#0e8b95f1d029530ad3f84a3f08a20d8dfd80a089"
|
||||
source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#796f93f7f45c7dc387ce49305154d29a4f511110"
|
||||
dependencies = [
|
||||
"glib-sys",
|
||||
"gobject-sys",
|
||||
|
|
@ -1347,7 +1348,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "gstreamer-sys"
|
||||
version = "0.17.0"
|
||||
source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#0e8b95f1d029530ad3f84a3f08a20d8dfd80a089"
|
||||
source = "git+https://gitlab.freedesktop.org/gstreamer/gstreamer-rs#796f93f7f45c7dc387ce49305154d29a4f511110"
|
||||
dependencies = [
|
||||
"glib-sys",
|
||||
"gobject-sys",
|
||||
|
|
@ -1364,7 +1365,7 @@ checksum = "1874c48e670519ce192093ac906c08a6dde7cb2d18b28722ef237726a39c3a63"
|
|||
[[package]]
|
||||
name = "gtk4"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/gtk-rs/gtk4-rs#e0cbea57b99e5a9b3b617589d5ff137806edd3b5"
|
||||
source = "git+https://github.com/gtk-rs/gtk4-rs#abea0c9980bc083494eceb30dfab5eeb99a73118"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"cairo-rs",
|
||||
|
|
@ -1386,7 +1387,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "gtk4-macros"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/gtk-rs/gtk4-rs#e0cbea57b99e5a9b3b617589d5ff137806edd3b5"
|
||||
source = "git+https://github.com/gtk-rs/gtk4-rs#abea0c9980bc083494eceb30dfab5eeb99a73118"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"heck",
|
||||
|
|
@ -1401,7 +1402,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "gtk4-sys"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/gtk-rs/gtk4-rs#e0cbea57b99e5a9b3b617589d5ff137806edd3b5"
|
||||
source = "git+https://github.com/gtk-rs/gtk4-rs#abea0c9980bc083494eceb30dfab5eeb99a73118"
|
||||
dependencies = [
|
||||
"cairo-sys-rs",
|
||||
"gdk-pixbuf-sys",
|
||||
|
|
@ -1609,9 +1610,9 @@ checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
|
|||
|
||||
[[package]]
|
||||
name = "jpeg-decoder"
|
||||
version = "0.1.21"
|
||||
version = "0.1.22"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d6187dc218616c3a222bae7b78938f5af5e7c27d9cbef4c30ebca709cd680bf8"
|
||||
checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2"
|
||||
dependencies = [
|
||||
"rayon",
|
||||
]
|
||||
|
|
@ -1675,9 +1676,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.82"
|
||||
version = "0.2.84"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "89203f3fba0a3795506acaad8ebce3c80c0af93f994d5a1d7a0b1eeb23271929"
|
||||
checksum = "1cca32fa0182e8c0989459524dc356b8f2b5c10f1b9eb521b7d182c03cf8c5ff"
|
||||
|
||||
[[package]]
|
||||
name = "libloading"
|
||||
|
|
@ -2038,7 +2039,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "pango"
|
||||
version = "0.13.0"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs#c58fab4fec1254244f598c4eac7f9310184c5996"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs#9c8a48bf11ccfdceab98aefff9b30dfd58b59bb8"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"glib",
|
||||
|
|
@ -2050,7 +2051,7 @@ dependencies = [
|
|||
[[package]]
|
||||
name = "pango-sys"
|
||||
version = "0.13.0"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs#c58fab4fec1254244f598c4eac7f9310184c5996"
|
||||
source = "git+https://github.com/gtk-rs/gtk-rs#9c8a48bf11ccfdceab98aefff9b30dfd58b59bb8"
|
||||
dependencies = [
|
||||
"glib-sys",
|
||||
"gobject-sys",
|
||||
|
|
@ -3091,9 +3092,9 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
|
|||
|
||||
[[package]]
|
||||
name = "wasi"
|
||||
version = "0.10.1+wasi-snapshot-preview1"
|
||||
version = "0.10.2+wasi-snapshot-preview1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "93c6c3420963c5c64bca373b25e77acb562081b9bb4dd5bb864187742186cea9"
|
||||
checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen"
|
||||
|
|
@ -3222,9 +3223,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "weezl"
|
||||
version = "0.1.3"
|
||||
version = "0.1.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3e2bb9fc8309084dd7cd651336673844c1d47f8ef6d2091ec160b27f5c4aa277"
|
||||
checksum = "4a32b378380f4e9869b22f0b5177c68a5519f03b3454fde0b291455ddbae266c"
|
||||
|
||||
[[package]]
|
||||
name = "wepoll-sys"
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ use crate::{
|
|||
models::{otp, Account, OTPMethod, OTPUri, Provider, ProvidersModel},
|
||||
widgets::{Camera, ErrorRevealer, ProviderImage, UrlRow},
|
||||
};
|
||||
use anyhow::{Context, Result};
|
||||
use anyhow::Result;
|
||||
use gettextrs::gettext;
|
||||
use glib::{clone, signal::Inhibit};
|
||||
use gtk::{gio, glib, prelude::*, subclass::prelude::*, CompositeTemplate};
|
||||
|
|
@ -137,8 +137,8 @@ impl AccountAddDialog {
|
|||
|
||||
fn validate(&self) {
|
||||
let self_ = imp::AccountAddDialog::from_instance(self);
|
||||
let username = self_.username_entry.get_text().unwrap();
|
||||
let token = self_.token_entry.get_text().unwrap();
|
||||
let username = self_.username_entry.get_text();
|
||||
let token = self_.token_entry.get_text();
|
||||
|
||||
let is_valid = !(username.is_empty() || token.is_empty());
|
||||
get_action!(self_.actions, @save).set_enabled(is_valid);
|
||||
|
|
@ -196,11 +196,8 @@ impl AccountAddDialog {
|
|||
let self_ = imp::AccountAddDialog::from_instance(self);
|
||||
|
||||
if let Some(ref provider) = *self_.selected_provider.borrow() {
|
||||
let username = self_
|
||||
.username_entry
|
||||
.get_text()
|
||||
.context("Could not get text")?;
|
||||
let token = self_.token_entry.get_text().context("Could not get text")?;
|
||||
let username = self_.username_entry.get_text();
|
||||
let token = self_.token_entry.get_text();
|
||||
if !otp::is_valid(&token) {
|
||||
self_.error_revealer.popup(&gettext("Invalid Token"));
|
||||
anyhow::bail!("Token {} is not a valid Base32 secret", &token);
|
||||
|
|
|
|||
|
|
@ -156,7 +156,7 @@ impl AccountRow {
|
|||
self_
|
||||
.name_entry
|
||||
.connect_changed(clone!(@weak self_.actions as actions => move |entry| {
|
||||
let name = entry.get_text().unwrap();
|
||||
let name = entry.get_text();
|
||||
get_action!(actions, @save).set_enabled(!name.is_empty());
|
||||
}));
|
||||
self_
|
||||
|
|
@ -214,7 +214,7 @@ impl AccountRow {
|
|||
self_.actions,
|
||||
"save",
|
||||
clone!(@weak self as row, @weak edit_stack, @weak name_entry => move |_, _| {
|
||||
let new_name = name_entry.get_text().unwrap();
|
||||
let new_name = name_entry.get_text();
|
||||
if let Err(err) = row.account().set_name(&new_name) {
|
||||
error!("Failed to update the account name {}", err);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -142,9 +142,9 @@ impl PasswordPage {
|
|||
fn validate(&self) {
|
||||
let self_ = imp::PasswordPage::from_instance(self);
|
||||
|
||||
let current_password = self_.current_password_entry.get_text().unwrap();
|
||||
let password = self_.password_entry.get_text().unwrap();
|
||||
let password_repeat = self_.confirm_password_entry.get_text().unwrap();
|
||||
let current_password = self_.current_password_entry.get_text();
|
||||
let password = self_.password_entry.get_text();
|
||||
let password_repeat = self_.confirm_password_entry.get_text();
|
||||
|
||||
let is_valid = if self.has_set_password() {
|
||||
password_repeat == password && current_password != password && password != ""
|
||||
|
|
@ -223,7 +223,7 @@ impl PasswordPage {
|
|||
fn reset_password(&self) {
|
||||
let self_ = imp::PasswordPage::from_instance(self);
|
||||
|
||||
let current_password = self_.current_password_entry.get_text().unwrap();
|
||||
let current_password = self_.current_password_entry.get_text();
|
||||
|
||||
if self.has_set_password()
|
||||
&& !Keyring::is_current_password(¤t_password).unwrap_or(false)
|
||||
|
|
@ -253,8 +253,8 @@ impl PasswordPage {
|
|||
let self_ = imp::PasswordPage::from_instance(self);
|
||||
let actions = self_.actions.get().unwrap();
|
||||
|
||||
let current_password = self_.current_password_entry.get_text().unwrap();
|
||||
let password = self_.password_entry.get_text().unwrap();
|
||||
let current_password = self_.current_password_entry.get_text();
|
||||
let password = self_.password_entry.get_text();
|
||||
|
||||
if self.has_set_password()
|
||||
&& !Keyring::is_current_password(¤t_password).unwrap_or(false)
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ impl ProvidersDialog {
|
|||
self_
|
||||
.search_entry
|
||||
.connect_search_changed(clone!(@weak self as dialog => move |entry| {
|
||||
let text = entry.get_text().unwrap().to_string();
|
||||
let text = entry.get_text().to_string();
|
||||
dialog.search(text);
|
||||
}));
|
||||
|
||||
|
|
|
|||
|
|
@ -236,7 +236,7 @@ impl Window {
|
|||
self_
|
||||
.search_entry
|
||||
.connect_search_changed(clone!(@weak providers => move |entry| {
|
||||
let text = entry.get_text().unwrap().to_string();
|
||||
let text = entry.get_text().to_string();
|
||||
providers.search(text);
|
||||
}));
|
||||
self_
|
||||
|
|
@ -298,7 +298,7 @@ impl Window {
|
|||
self,
|
||||
"unlock",
|
||||
clone!(@weak self as win, @weak password_entry, @weak app => move |_, _| {
|
||||
let password = password_entry.get_text().unwrap();
|
||||
let password = password_entry.get_text();
|
||||
if Keyring::is_current_password(&password).unwrap_or_else(|err| {
|
||||
debug!("Could not verify password: {:?}", err);
|
||||
false
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user