mirror of
https://gitlab.gnome.org/World/Authenticator.git
synced 2025-03-04 08:44:40 +01:00
widgets: Mark provider as nullable for ProviderImage
Fix a regression since the migration to properties macro
This commit is contained in:
parent
5c4fb11220
commit
b8cef05ecd
4 changed files with 5 additions and 6 deletions
|
@ -331,7 +331,7 @@ impl AccountAddDialog {
|
|||
imp.provider_entry.set_text(&provider.name());
|
||||
imp.period_label.set_text(&provider.period().to_string());
|
||||
|
||||
imp.image.set_provider(&provider);
|
||||
imp.image.set_provider(Some(&provider));
|
||||
|
||||
imp.method_label
|
||||
.set_text(&provider.method().to_locale_string());
|
||||
|
|
|
@ -27,7 +27,7 @@ mod imp {
|
|||
pub was_downloaded: Cell<bool>,
|
||||
pub sender: Sender<ImageAction>,
|
||||
pub receiver: RefCell<Option<Receiver<ImageAction>>>,
|
||||
#[property(get, set = Self::set_provider)]
|
||||
#[property(get, set = Self::set_provider, nullable)]
|
||||
pub provider: RefCell<Option<Provider>>,
|
||||
#[template_child]
|
||||
pub stack: TemplateChild<gtk::Stack>,
|
||||
|
|
|
@ -198,7 +198,7 @@ impl ProviderPage {
|
|||
imp.methods_model
|
||||
.find_position(provider.method().into_glib()),
|
||||
);
|
||||
imp.image.set_provider(&provider);
|
||||
imp.image.set_provider(Some(&provider));
|
||||
imp.title
|
||||
.set_title(&i18n::i18n_f("Editing Provider: {}", &[&provider.name()]));
|
||||
imp.selected_provider.replace(Some(provider));
|
||||
|
@ -222,8 +222,7 @@ impl ProviderPage {
|
|||
imp.methods_model
|
||||
.find_position(Method::default().into_glib()),
|
||||
);
|
||||
// FIXME: replace with something that works
|
||||
// imp.image.set_provider(None);
|
||||
imp.image.set_provider(None::<Provider>);
|
||||
imp.title.set_title(&gettext("New Provider"));
|
||||
imp.selected_provider.replace(None);
|
||||
}
|
||||
|
|
|
@ -144,7 +144,7 @@ impl ProviderRow {
|
|||
|
||||
self.add_css_class(&provider.method().to_string());
|
||||
|
||||
imp.image.set_provider(&provider);
|
||||
imp.image.set_provider(Some(&provider));
|
||||
if provider.method().is_event_based() {
|
||||
imp.progress_icon.set_visible(false);
|
||||
} else {
|
||||
|
|
Loading…
Add table
Reference in a new issue