diff options
Diffstat (limited to 'main/src')
| -rw-r--r-- | main/src/plugins/omemo/ui/encryption_preferences_entry.vala | 4 | ||||
| -rw-r--r-- | main/src/plugins/omemo/ui/manage_key_dialog.vala | 3 | ||||
| -rw-r--r-- | main/src/ui/main_window.vala | 24 | ||||
| -rw-r--r-- | main/src/ui/util/data_forms.vala | 2 |
4 files changed, 20 insertions, 13 deletions
diff --git a/main/src/plugins/omemo/ui/encryption_preferences_entry.vala b/main/src/plugins/omemo/ui/encryption_preferences_entry.vala index 55faecac..7f53a1b2 100644 --- a/main/src/plugins/omemo/ui/encryption_preferences_entry.vala +++ b/main/src/plugins/omemo/ui/encryption_preferences_entry.vala @@ -224,6 +224,10 @@ public class OmemoPreferencesWidget : Adw.PreferencesGroup { case TrustLevel.VERIFIED: trust_str = _("Verified"); break; + case TrustLevel.TRUSTED: + case TrustLevel.UNKNOWN: + default: + break; } action_row.add_suffix(new Label(trust_str)); diff --git a/main/src/plugins/omemo/ui/manage_key_dialog.vala b/main/src/plugins/omemo/ui/manage_key_dialog.vala index 65033999..59e6db24 100644 --- a/main/src/plugins/omemo/ui/manage_key_dialog.vala +++ b/main/src/plugins/omemo/ui/manage_key_dialog.vala @@ -141,6 +141,9 @@ public class ManageKeyDialog : Gtk.Dialog { main_desc_label.set_markup(_("This key is currently %s.").printf("<span color='#D91900'>"+_("rejected")+"</span>")+" "+_("This means it cannot be used by %s to decipher your messages, and you won't see messages encrypted with it.").printf(@"<b>$(device[db.identity_meta.address_name])</b>")); main_action_list.append(accept_row); break; + case TrustLevel.UNKNOWN: + default: + break; } //Row clicked - go to appropriate screen diff --git a/main/src/ui/main_window.vala b/main/src/ui/main_window.vala index d2a23954..da6960ea 100644 --- a/main/src/ui/main_window.vala +++ b/main/src/ui/main_window.vala @@ -11,21 +11,21 @@ public class MainWindow : Adw.ApplicationWindow { public signal void conversation_selected(Conversation conversation); - [GtkChild] public Stack stack; - [GtkChild] public Adw.NavigationSplitView navigation_split_view; + [GtkChild] public unowned Stack stack; + [GtkChild] public unowned Adw.NavigationSplitView navigation_split_view; - [GtkChild] public MenuButton add_button; - [GtkChild] public MenuButton menu_button; + [GtkChild] public unowned MenuButton add_button; + [GtkChild] public unowned MenuButton menu_button; - [GtkChild] public Adw.HeaderBar conversation_headerbar; - [GtkChild] public Adw.WindowTitle conversation_window_title; + [GtkChild] public unowned Adw.HeaderBar conversation_headerbar; + [GtkChild] public unowned Adw.WindowTitle conversation_window_title; - [GtkChild] public ConversationView conversation_view; - [GtkChild] public ConversationSelector conversation_selector; - [GtkChild] public Adw.Flap search_flap; - [GtkChild] private Stack left_stack; - [GtkChild] private Stack right_stack; - [GtkChild] public Adw.Bin search_frame; + [GtkChild] public unowned ConversationView conversation_view; + [GtkChild] public unowned ConversationSelector conversation_selector; + [GtkChild] public unowned Adw.Flap search_flap; + [GtkChild] private unowned Stack left_stack; + [GtkChild] private unowned Stack right_stack; + [GtkChild] public unowned Adw.Bin search_frame; public GlobalSearch global_search; diff --git a/main/src/ui/util/data_forms.vala b/main/src/ui/util/data_forms.vala index 7fb9b87d..0b91da15 100644 --- a/main/src/ui/util/data_forms.vala +++ b/main/src/ui/util/data_forms.vala @@ -18,7 +18,7 @@ namespace Dino.Ui.Util { } public static ViewModel.PreferencesRow.Any? get_data_form_field_view_model(DataForms.DataForm.Field field) { - if (field.type_ == null) return null; + if (field.type_ == DataForms.DataForm.Type.UNKNOWN) return null; ViewModel.PreferencesRow.Any? view_model = null; |