diff options
author | fiaxh <git@lightrise.org> | 2021-10-11 23:08:50 +0200 |
---|---|---|
committer | fiaxh <git@lightrise.org> | 2021-10-12 17:58:18 +0200 |
commit | 8d8dcf5af67ad89c328e67dc2c3469ef90283d9a (patch) | |
tree | bb4f055a17e5ef0d1f896b3eeb7522c639fc58fd | |
parent | c85945ae26cab7eb65c67dbe49ebbf668a028b1c (diff) | |
download | dino-8d8dcf5af67ad89c328e67dc2c3469ef90283d9a.tar.gz dino-8d8dcf5af67ad89c328e67dc2c3469ef90283d9a.zip |
Fix compiler warnings ('[GtkChild] fields must be declared as `unowned'')
28 files changed, 218 insertions, 218 deletions
diff --git a/main/src/ui/add_conversation/add_contact_dialog.vala b/main/src/ui/add_conversation/add_contact_dialog.vala index 7e9b5185..7b4f40a0 100644 --- a/main/src/ui/add_conversation/add_contact_dialog.vala +++ b/main/src/ui/add_conversation/add_contact_dialog.vala @@ -19,11 +19,11 @@ protected class AddContactDialog : Gtk.Dialog { set { jid_entry.text = value; } } - [GtkChild] private AccountComboBox account_combobox; - [GtkChild] private Button ok_button; - [GtkChild] private Button cancel_button; - [GtkChild] private Entry jid_entry; - [GtkChild] private Entry alias_entry; + [GtkChild] private unowned AccountComboBox account_combobox; + [GtkChild] private unowned Button ok_button; + [GtkChild] private unowned Button cancel_button; + [GtkChild] private unowned Entry jid_entry; + [GtkChild] private unowned Entry alias_entry; private StreamInteractor stream_interactor; diff --git a/main/src/ui/add_conversation/add_groupchat_dialog.vala b/main/src/ui/add_conversation/add_groupchat_dialog.vala index 46298d81..a71c0a15 100644 --- a/main/src/ui/add_conversation/add_groupchat_dialog.vala +++ b/main/src/ui/add_conversation/add_groupchat_dialog.vala @@ -9,13 +9,13 @@ namespace Dino.Ui { [GtkTemplate (ui = "/im/dino/Dino/add_conversation/add_groupchat_dialog.ui")] protected class AddGroupchatDialog : Gtk.Dialog { - [GtkChild] private Stack accounts_stack; - [GtkChild] private AccountComboBox account_combobox; - [GtkChild] private Button ok_button; - [GtkChild] private Button cancel_button; - [GtkChild] private Entry jid_entry; - [GtkChild] private Entry alias_entry; - [GtkChild] private Entry nick_entry; + [GtkChild] private unowned Stack accounts_stack; + [GtkChild] private unowned AccountComboBox account_combobox; + [GtkChild] private unowned Button ok_button; + [GtkChild] private unowned Button cancel_button; + [GtkChild] private unowned Entry jid_entry; + [GtkChild] private unowned Entry alias_entry; + [GtkChild] private unowned Entry nick_entry; private StreamInteractor stream_interactor; private bool alias_entry_changed = false; diff --git a/main/src/ui/add_conversation/conference_details_fragment.vala b/main/src/ui/add_conversation/conference_details_fragment.vala index 0b8306e4..88f9cc73 100644 --- a/main/src/ui/add_conversation/conference_details_fragment.vala +++ b/main/src/ui/add_conversation/conference_details_fragment.vala @@ -62,30 +62,30 @@ protected class ConferenceDetailsFragment : Box { public bool fragment_active { get; set; default=true; } - [GtkChild] private Stack accounts_stack; - [GtkChild] private Button accounts_button; - [GtkChild] private Label accounts_label; - [GtkChild] private AccountComboBox account_combobox; - - [GtkChild] private Stack jid_stack; - [GtkChild] private Button jid_button; - [GtkChild] private Label jid_label; - [GtkChild] private Entry jid_entry; - - [GtkChild] private Stack nick_stack; - [GtkChild] private Button nick_button; - [GtkChild] private Label nick_label; - [GtkChild] private Entry nick_entry; - - [GtkChild] private Stack password_stack; - [GtkChild] private Button password_button; - [GtkChild] private Label password_label; - [GtkChild] private Label password_text_label; - [GtkChild] private Entry password_entry; - - [GtkChild] private Revealer notification_revealer; - [GtkChild] private Button notification_button; - [GtkChild] private Label notification_label; + [GtkChild] private unowned Stack accounts_stack; + [GtkChild] private unowned Button accounts_button; + [GtkChild] private unowned Label accounts_label; + [GtkChild] private unowned AccountComboBox account_combobox; + + [GtkChild] private unowned Stack jid_stack; + [GtkChild] private unowned Button jid_button; + [GtkChild] private unowned Label jid_label; + [GtkChild] private unowned Entry jid_entry; + + [GtkChild] private unowned Stack nick_stack; + [GtkChild] private unowned Button nick_button; + [GtkChild] private unowned Label nick_label; + [GtkChild] private unowned Entry nick_entry; + + [GtkChild] private unowned Stack password_stack; + [GtkChild] private unowned Button password_button; + [GtkChild] private unowned Label password_label; + [GtkChild] private unowned Label password_text_label; + [GtkChild] private unowned Entry password_entry; + + [GtkChild] private unowned Revealer notification_revealer; + [GtkChild] private unowned Button notification_button; + [GtkChild] private unowned Label notification_label; private StreamInteractor stream_interactor; private Button ok_button_; diff --git a/main/src/ui/add_conversation/list_row.vala b/main/src/ui/add_conversation/list_row.vala index 4dec567a..97c2b2fe 100644 --- a/main/src/ui/add_conversation/list_row.vala +++ b/main/src/ui/add_conversation/list_row.vala @@ -9,9 +9,9 @@ namespace Dino.Ui { [GtkTemplate (ui = "/im/dino/Dino/add_conversation/list_row.ui")] public class ListRow : ListBoxRow { - [GtkChild] public AvatarImage image; - [GtkChild] public Label name_label; - [GtkChild] public Label via_label; + [GtkChild] public unowned AvatarImage image; + [GtkChild] public unowned Label name_label; + [GtkChild] public unowned Label via_label; public Jid? jid; public Account? account; diff --git a/main/src/ui/add_conversation/select_jid_fragment.vala b/main/src/ui/add_conversation/select_jid_fragment.vala index 2035b14b..bc349b6c 100644 --- a/main/src/ui/add_conversation/select_jid_fragment.vala +++ b/main/src/ui/add_conversation/select_jid_fragment.vala @@ -16,10 +16,10 @@ public class SelectJidFragment : Gtk.Box { private set {} } - [GtkChild] private Entry entry; - [GtkChild] private Box box; - [GtkChild] private Button add_button; - [GtkChild] private Button remove_button; + [GtkChild] private unowned Entry entry; + [GtkChild] private unowned Box box; + [GtkChild] private unowned Button add_button; + [GtkChild] private unowned Button remove_button; private StreamInteractor stream_interactor; private FilterableList filterable_list; diff --git a/main/src/ui/chat_input/view.vala b/main/src/ui/chat_input/view.vala index fe0767cb..5142eb10 100644 --- a/main/src/ui/chat_input/view.vala +++ b/main/src/ui/chat_input/view.vala @@ -19,12 +19,12 @@ public class View : Box { private Conversation? conversation; private HashMap<Conversation, string> entry_cache = new HashMap<Conversation, string>(Conversation.hash_func, Conversation.equals_func); - [GtkChild] public Frame frame; - [GtkChild] public ChatTextView chat_text_view; - [GtkChild] public Box outer_box; - [GtkChild] public Button file_button; - [GtkChild] public Separator file_separator; - [GtkChild] public Label chat_input_status; + [GtkChild] public unowned Frame frame; + [GtkChild] public unowned ChatTextView chat_text_view; + [GtkChild] public unowned Box outer_box; + [GtkChild] public unowned Button file_button; + [GtkChild] public unowned Separator file_separator; + [GtkChild] public unowned Label chat_input_status; public EncryptionButton encryption_widget; diff --git a/main/src/ui/contact_details/dialog.vala b/main/src/ui/contact_details/dialog.vala index 35647eee..f29d068e 100644 --- a/main/src/ui/contact_details/dialog.vala +++ b/main/src/ui/contact_details/dialog.vala @@ -10,12 +10,12 @@ namespace Dino.Ui.ContactDetails { [GtkTemplate (ui = "/im/dino/Dino/contact_details_dialog.ui")] public class Dialog : Gtk.Dialog { - [GtkChild] public AvatarImage avatar; - [GtkChild] public Util.EntryLabelHybrid name_hybrid; - [GtkChild] public Label name_label; - [GtkChild] public Label jid_label; - [GtkChild] public Label account_label; - [GtkChild] public Box main_box; + [GtkChild] public unowned AvatarImage avatar; + [GtkChild] public unowned Util.EntryLabelHybrid name_hybrid; + [GtkChild] public unowned Label name_label; + [GtkChild] public unowned Label jid_label; + [GtkChild] public unowned Label account_label; + [GtkChild] public unowned Box main_box; private StreamInteractor stream_interactor; private Conversation conversation; diff --git a/main/src/ui/conversation_content_view/call_widget.vala b/main/src/ui/conversation_content_view/call_widget.vala index 9667e475..62156761 100644 --- a/main/src/ui/conversation_content_view/call_widget.vala +++ b/main/src/ui/conversation_content_view/call_widget.vala @@ -27,12 +27,12 @@ namespace Dino.Ui { [GtkTemplate (ui = "/im/dino/Dino/call_widget.ui")] public class CallWidget : SizeRequestBox { - [GtkChild] public Image image; - [GtkChild] public Label title_label; - [GtkChild] public Label subtitle_label; - [GtkChild] public Revealer incoming_call_revealer; - [GtkChild] public Button accept_call_button; - [GtkChild] public Button reject_call_button; + [GtkChild] public unowned Image image; + [GtkChild] public unowned Label title_label; + [GtkChild] public unowned Label subtitle_label; + [GtkChild] public unowned Revealer incoming_call_revealer; + [GtkChild] public unowned Button accept_call_button; + [GtkChild] public unowned Button reject_call_button; private StreamInteractor stream_interactor; private Call call; diff --git a/main/src/ui/conversation_content_view/conversation_item_skeleton.vala b/main/src/ui/conversation_content_view/conversation_item_skeleton.vala index d6bf5089..b356d8cc 100644 --- a/main/src/ui/conversation_content_view/conversation_item_skeleton.vala +++ b/main/src/ui/conversation_content_view/conversation_item_skeleton.vala @@ -113,9 +113,9 @@ public class ConversationItemSkeleton : EventBox { [GtkTemplate (ui = "/im/dino/Dino/conversation_content_view/item_metadata_header.ui")] public class ItemMetaDataHeader : Box { - [GtkChild] public Label name_label; - [GtkChild] public Label dot_label; - [GtkChild] public Label time_label; + [GtkChild] public unowned Label name_label; + [GtkChild] public unowned Label dot_label; + [GtkChild] public unowned Label time_label; public Image received_image = new Image() { opacity=0.4 }; public Widget? encryption_image = null; diff --git a/main/src/ui/conversation_content_view/conversation_view.vala b/main/src/ui/conversation_content_view/conversation_view.vala index 9eb18cfd..d6cbed62 100644 --- a/main/src/ui/conversation_content_view/conversation_view.vala +++ b/main/src/ui/conversation_content_view/conversation_view.vala @@ -12,16 +12,16 @@ public class ConversationView : Box, Plugins.ConversationItemCollection, Plugins public Conversation? conversation { get; private set; } - [GtkChild] public ScrolledWindow scrolled; - [GtkChild] private Revealer notification_revealer; - [GtkChild] private Box message_menu_box; - [GtkChild] private Button button1; - [GtkChild] private Image button1_icon; - [GtkChild] private Box notifications; - [GtkChild] private Box main; - [GtkChild] private EventBox main_event_box; - [GtkChild] private EventBox main_wrap_event_box; - [GtkChild] private Stack stack; + [GtkChild] public unowned ScrolledWindow scrolled; + [GtkChild] private unowned Revealer notification_revealer; + [GtkChild] private unowned Box message_menu_box; + [GtkChild] private unowned Button button1; + [GtkChild] private unowned Image button1_icon; + [GtkChild] private unowned Box notifications; + [GtkChild] private unowned Box main; + [GtkChild] private unowned EventBox main_event_box; + [GtkChild] private unowned EventBox main_wrap_event_box; + [GtkChild] private unowned Stack stack; private StreamInteractor stream_interactor; private Gee.TreeSet<Plugins.MetaConversationItem> content_items = new Gee.TreeSet<Plugins.MetaConversationItem>(compare_meta_items); diff --git a/main/src/ui/conversation_content_view/file_default_widget.vala b/main/src/ui/conversation_content_view/file_default_widget.vala index 33b8f8a7..892c7ba2 100644 --- a/main/src/ui/conversation_content_view/file_default_widget.vala +++ b/main/src/ui/conversation_content_view/file_default_widget.vala @@ -9,12 +9,12 @@ namespace Dino.Ui { [GtkTemplate (ui = "/im/dino/Dino/file_default_widget.ui")] public class FileDefaultWidget : EventBox { - [GtkChild] public Stack image_stack; - [GtkChild] public Label name_label; - [GtkChild] public Label mime_label; - [GtkChild] public Image content_type_image; - [GtkChild] public Spinner spinner; - [GtkChild] public EventBox stack_event_box; + [GtkChild] public unowned Stack image_stack; + [GtkChild] public unowned Label name_label; + [GtkChild] public unowned Label mime_label; + [GtkChild] public unowned Image content_type_image; + [GtkChild] public unowned Spinner spinner; + [GtkChild] public unowned EventBox stack_event_box; private FileTransfer.State state; diff --git a/main/src/ui/conversation_content_view/message_widget.vala b/main/src/ui/conversation_content_view/message_widget.vala index 93e48848..a2325797 100644 --- a/main/src/ui/conversation_content_view/message_widget.vala +++ b/main/src/ui/conversation_content_view/message_widget.vala @@ -271,11 +271,11 @@ public class MessageItemEditMode : Box { public signal void cancelled(); public signal void send(); - [GtkChild] public MenuButton emoji_button; - [GtkChild] public ChatTextView chat_text_view; - [GtkChild] public Button cancel_button; - [GtkChild] public Button send_button; - [GtkChild] public Frame frame; + [GtkChild] public unowned MenuButton emoji_button; + [GtkChild] public unowned ChatTextView chat_text_view; + [GtkChild] public unowned Button cancel_button; + [GtkChild] public unowned Button send_button; + [GtkChild] public unowned Frame frame; construct { Util.force_css(frame, "* { border-radius: 3px; }"); diff --git a/main/src/ui/conversation_list_titlebar.vala b/main/src/ui/conversation_list_titlebar.vala index 901902db..d97bec6e 100644 --- a/main/src/ui/conversation_list_titlebar.vala +++ b/main/src/ui/conversation_list_titlebar.vala @@ -7,8 +7,8 @@ namespace Dino.Ui { [GtkTemplate (ui = "/im/dino/Dino/conversation_list_titlebar.ui")] public class ConversationListTitlebar : Gtk.Box { - [GtkChild] private MenuButton add_button; - [GtkChild] private MenuButton menu_button; + [GtkChild] private unowned MenuButton add_button; + [GtkChild] private unowned MenuButton menu_button; public ConversationListTitlebar() { create_add_menu(add_button, menu_button); @@ -18,8 +18,8 @@ public class ConversationListTitlebar : Gtk.Box { [GtkTemplate (ui = "/im/dino/Dino/conversation_list_titlebar_csd.ui")] public class ConversationListTitlebarCsd : Gtk.HeaderBar { - [GtkChild] private MenuButton add_button; - [GtkChild] private MenuButton menu_button; + [GtkChild] private unowned MenuButton add_button; + [GtkChild] private unowned MenuButton menu_button; public ConversationListTitlebarCsd() { custom_title = new Label("Dino") { visible = true, hexpand = true, xalign = 0 }; diff --git a/main/src/ui/conversation_selector/conversation_selector_row.vala b/main/src/ui/conversation_selector/conversation_selector_row.vala index 6f181a64..067f257c 100644 --- a/main/src/ui/conversation_selector/conversation_selector_row.vala +++ b/main/src/ui/conversation_selector/conversation_selector_row.vala @@ -12,17 +12,17 @@ namespace Dino.Ui { [GtkTemplate (ui = "/im/dino/Dino/conversation_row.ui")] public class ConversationSelectorRow : ListBoxRow { - [GtkChild] protected AvatarImage image; - [GtkChild] protected Label name_label; - [GtkChild] protected Label time_label; - [GtkChild] protected Label nick_label; - [GtkChild] protected Label message_label; - [GtkChild] protected Label unread_count_label; - [GtkChild] protected Button x_button; - [GtkChild] protected Revealer time_revealer; - [GtkChild] protected Revealer xbutton_revealer; - [GtkChild] protected Revealer unread_count_revealer; - [GtkChild] public Revealer main_revealer; + [GtkChild] protected unowned AvatarImage image; + [GtkChild] protected unowned Label name_label; + [GtkChild] protected unowned Label time_label; + [GtkChild] protected unowned Label nick_label; + [GtkChild] protected unowned Label message_label; + [GtkChild] protected unowned Label unread_count_label; + [GtkChild] protected unowned Button x_button; + [GtkChild] protected unowned Revealer time_revealer; + [GtkChild] protected unowned Revealer xbutton_revealer; + [GtkChild] protected unowned Revealer unread_count_revealer; + [GtkChild] public unowned Revealer main_revealer; public Conversation conversation { get; private set; } diff --git a/main/src/ui/conversation_view.vala b/main/src/ui/conversation_view.vala index 53f1c4c8..af7e32c1 100644 --- a/main/src/ui/conversation_view.vala +++ b/main/src/ui/conversation_view.vala @@ -9,11 +9,11 @@ namespace Dino.Ui { [GtkTemplate (ui = "/im/dino/Dino/conversation_view.ui")] public class ConversationView : Gtk.Overlay { - [GtkChild] public Revealer goto_end_revealer; - [GtkChild] public Button goto_end_button; - [GtkChild] public ChatInput.View chat_input; - [GtkChild] public ConversationSummary.ConversationView conversation_frame; - [GtkChild] public Revealer white_revealer; + [GtkChild] public unowned Revealer goto_end_revealer; + [GtkChild] public unowned Button goto_end_button; + [GtkChild] public unowned ChatInput.View chat_input; + [GtkChild] public unowned ConversationSummary.ConversationView conversation_frame; + [GtkChild] public unowned Revealer white_revealer; construct { white_revealer.notify["child-revealed"].connect_after(on_child_revealed_changed); diff --git a/main/src/ui/file_send_overlay.vala b/main/src/ui/file_send_overlay.vala index e92cf836..369d291a 100644 --- a/main/src/ui/file_send_overlay.vala +++ b/main/src/ui/file_send_overlay.vala @@ -12,10 +12,10 @@ public class FileSendOverlay : Gtk.EventBox { public signal void close(); public signal void send_file(); - [GtkChild] public Button close_button; - [GtkChild] public Button send_button; - [GtkChild] public SizingBin file_widget_insert; - [GtkChild] public Label info_label; + [GtkChild] public unowned Button close_button; + [GtkChild] public unowned Button send_button; + [GtkChild] public unowned SizingBin file_widget_insert; + [GtkChild] public unowned Label info_label; private bool can_send = true; diff --git a/main/src/ui/global_search.vala b/main/src/ui/global_search.vala index 0d6341cc..f765d4d9 100644 --- a/main/src/ui/global_search.vala +++ b/main/src/ui/global_search.vala @@ -14,13 +14,13 @@ public class GlobalSearch : Overlay { private int loaded_results = -1; private Mutex reloading_mutex = Mutex(); - [GtkChild] public SearchEntry search_entry; - [GtkChild] public Label entry_number_label; - [GtkChild] public ScrolledWindow results_scrolled; - [GtkChild] public Box results_box; - [GtkChild] public Stack results_empty_stack; - [GtkChild] public Frame auto_complete_overlay; - [GtkChild] public ListBox auto_complete_list; + [GtkChild] public unowned SearchEntry search_entry; + [GtkChild] public unowned Label entry_number_label; + [GtkChild] public unowned ScrolledWindow results_scrolled; + [GtkChild] public unowned Box results_box; + [GtkChild] public unowned Stack results_empty_stack; + [GtkChild] public unowned Frame auto_complete_overlay; + [GtkChild] public unowned ListBox auto_complete_list; public GlobalSearch init(StreamInteractor stream_interactor) { this.stream_interactor = stream_interactor; diff --git a/main/src/ui/main_window.vala b/main/src/ui/main_window.vala index df24038a..04c01b26 100644 --- a/main/src/ui/main_window.vala +++ b/main/src/ui/main_window.vala @@ -215,10 +215,10 @@ public class NoAccountsPlaceholder : MainWindowPlaceholder { [GtkTemplate (ui = "/im/dino/Dino/unified_window_placeholder.ui")] public class MainWindowPlaceholder : Box { - [GtkChild] public Label title_label; - [GtkChild] public Label label; - [GtkChild] public Button primary_button; - [GtkChild] public Button secondary_button; + [GtkChild] public unowned Label title_label; + [GtkChild] public unowned Label label; + [GtkChild] public unowned Button primary_button; + [GtkChild] public unowned Button secondary_button; } } diff --git a/main/src/ui/manage_accounts/account_row.vala b/main/src/ui/manage_accounts/account_row.vala index f5415d4d..b3a33eae 100644 --- a/main/src/ui/manage_accounts/account_row.vala +++ b/main/src/ui/manage_accounts/account_row.vala @@ -7,9 +7,9 @@ namespace Dino.Ui.ManageAccounts { [GtkTemplate (ui = "/im/dino/Dino/manage_accounts/account_row.ui")] public class AccountRow : Gtk.ListBoxRow { - [GtkChild] public AvatarImage image; - [GtkChild] public Label jid_label; - [GtkChild] public Image icon; + [GtkChild] public unowned AvatarImage image; + [GtkChild] public unowned Label jid_label; + [GtkChild] public unowned Image icon; public Account account; private StreamInteractor stream_interactor; diff --git a/main/src/ui/manage_accounts/add_account_dialog.vala b/main/src/ui/manage_accounts/add_account_dialog.vala index 2f2bcb43..9cf60e3f 100644 --- a/main/src/ui/manage_accounts/add_account_dialog.vala +++ b/main/src/ui/manage_accounts/add_account_dialog.vala @@ -12,55 +12,55 @@ public class AddAccountDialog : Gtk.Dialog { public signal void added(Account account); - [GtkChild] private Stack stack; + [GtkChild] private unowned Stack stack; - [GtkChild] private Revealer notification_revealer; - [GtkChild] private Label notification_label; + [GtkChild] private unowned Revealer notification_revealer; + [GtkChild] private unowned Label notification_label; // Sign in - JID - [GtkChild] private Box sign_in_jid_box; - [GtkChild] private Label sign_in_jid_error_label; - [GtkChild] private Entry jid_entry; - [GtkChild] private Stack sign_in_jid_continue_stack; - [GtkChild] private Button sign_in_jid_continue_button; - [GtkChild] private Button sign_in_jid_serverlist_button; + [GtkChild] private unowned Box sign_in_jid_box; + [GtkChild] private unowned Label sign_in_jid_error_label; + [GtkChild] private unowned Entry jid_entry; + [GtkChild] private unowned Stack sign_in_jid_continue_stack; + [GtkChild] private unowned Button sign_in_jid_continue_button; + [GtkChild] private unowned Button sign_in_jid_serverlist_button; // Sign in - TLS error - [GtkChild] private Box sign_in_tls_box; - [GtkChild] private Label sign_in_tls_label; - [GtkChild] private Stack sign_in_password_continue_stack; - [GtkChild] private Button sign_in_tls_back_button; + [GtkChild] private unowned Box sign_in_tls_box; + [GtkChild] private unowned Label sign_in_tls_label; + [GtkChild] private unowned Stack sign_in_password_continue_stack; + [GtkChild] private unowned Button sign_in_tls_back_button; // Sign in - Password - [GtkChild] private Box sign_in_password_box; - [GtkChild] private Label sign_in_password_title; - [GtkChild] private Label sign_in_password_error_label; + [GtkChild] private unowned Box sign_in_password_box; + [GtkChild] private unowned Label sign_in_password_title; + [GtkChild] private unowned Label sign_in_password_error_label; - [GtkChild] private Entry password_entry; - [GtkChild] private Button sign_in_password_continue_button; - [GtkChild] private Button sign_in_password_back_button; + [GtkChild] private unowned Entry password_entry; + [GtkChild] private unowned Button sign_in_password_continue_button; + [GtkChild] private unowned Button sign_in_password_back_button; // Select Server - [GtkChild] private Box create_account_box; - [GtkChild] private Button login_button; - [GtkChild] private Stack select_server_continue_stack; - [GtkChild] private Button select_server_continue; - [GtkChild] private Label register_form_continue_label; - [GtkChild] private ListBox server_list_box; - [GtkChild] private Entry server_entry; + [GtkChild] private unowned Box create_account_box; + [GtkChild] private unowned Button login_button; + [GtkChild] private unowned Stack select_server_continue_stack; + [GtkChild] private unowned Button select_server_continue; + [GtkChild] private unowned Label register_form_continue_label; + [GtkChild] private unowned ListBox server_list_box; + [GtkChild] private unowned Entry server_entry; // Register Form - [GtkChild] private Box register_box; - [GtkChild] private Label register_title; - [GtkChild] private Box form_box; - [GtkChild] private Button register_form_back; - [GtkChild] private Stack register_form_continue_stack; - [GtkChild] private Button register_form_continue; + [GtkChild] private unowned Box register_box; + [GtkChild] private unowned Label register_title; + [GtkChild] private unowned Box form_box; + [GtkChild] private unowned Button register_form_back; + [GtkChild] private unowned Stack register_form_continue_stack; + [GtkChild] private unowned Button register_form_continue; // Success - [GtkChild] private Box success_box; - [GtkChild] private Label success_description; - [GtkChild] private Button success_continue_button; + [GtkChild] private unowned Box success_box; + [GtkChild] private unowned Label success_description; + [GtkChild] private unowned Button success_continue_button; private static string[] server_list = new string[]{ "5222.de", diff --git a/main/src/ui/manage_accounts/dialog.vala b/main/src/ui/manage_accounts/dialog.vala index f7af5159..5d596bc2 100644 --- a/main/src/ui/manage_accounts/dialog.vala +++ b/main/src/ui/manage_accounts/dialog.vala @@ -14,19 +14,19 @@ public class Dialog : Gtk.Dialog { public signal void account_enabled(Account account); public signal void account_disabled(Account account); - [GtkChild] public Stack main_stack; - [GtkChild] public ListBox account_list; - [GtkChild] public Button no_accounts_add; - [GtkChild] public ToolButton add_account_button; - [GtkChild] public ToolButton remove_account_button; - [GtkChild] public AvatarImage image; - [GtkChild] public Button image_button; - [GtkChild] public Label jid_label; - [GtkChild] public Label state_label; - [GtkChild] public Switch active_switch; - [GtkChild] public Util.EntryLabelHybrid password_hybrid; - [GtkChild] public Util.EntryLabelHybrid alias_hybrid; - [GtkChild] public Grid settings_list; + [GtkChild] public unowned Stack main_stack; + [GtkChild] public unowned ListBox account_list; + [GtkChild] public unowned Button no_accounts_add; + [GtkChild] public unowned ToolButton add_account_button; + [GtkChild] public unowned ToolButton remove_account_button; + [GtkChild] public unowned AvatarImage image; + [GtkChild] public unowned Button image_button; + [GtkChild] public unowned Label jid_label; + [GtkChild] public unowned Label state_label; + [GtkChild] public unowned Switch active_switch; + [GtkChild] public unowned Util.EntryLabelHybrid password_hybrid; + [GtkChild] public unowned Util.EntryLabelHybrid alias_hybrid; + [GtkChild] public unowned Grid settings_list; private ArrayList<Plugins.AccountSettingsWidget> plugin_widgets = new ArrayList<Plugins.AccountSettingsWidget>(); diff --git a/main/src/ui/occupant_menu/list.vala b/main/src/ui/occupant_menu/list.vala index 960b716b..fcb039d7 100644 --- a/main/src/ui/occupant_menu/list.vala +++ b/main/src/ui/occupant_menu/list.vala @@ -12,8 +12,8 @@ public class List : Box { public signal void conversation_selected(Conversation? conversation); private StreamInteractor stream_interactor; - [GtkChild] public ListBox list_box; - [GtkChild] private SearchEntry search_entry; + [GtkChild] public unowned ListBox list_box; + [GtkChild] private unowned SearchEntry search_entry; private Conversation conversation; private string[]? filter_values; diff --git a/main/src/ui/occupant_menu/list_row.vala b/main/src/ui/occupant_menu/list_row.vala index 92fff32f..e0fb3f14 100644 --- a/main/src/ui/occupant_menu/list_row.vala +++ b/main/src/ui/occupant_menu/list_row.vala @@ -8,8 +8,8 @@ namespace Dino.Ui.OccupantMenu { [GtkTemplate (ui = "/im/dino/Dino/occupant_list_item.ui")] public class ListRow : ListBoxRow { - [GtkChild] private AvatarImage image; - [GtkChild] public Label name_label; + [GtkChild] private unowned AvatarImage image; + [GtkChild] public unowned Label name_label; public Conversation? conversation; public Jid? jid; diff --git a/main/src/ui/settings_dialog.vala b/main/src/ui/settings_dialog.vala index a24b9c22..e994e00c 100644 --- a/main/src/ui/settings_dialog.vala +++ b/main/src/ui/settings_dialog.vala @@ -5,11 +5,11 @@ namespace Dino.Ui { [GtkTemplate (ui = "/im/dino/Dino/settings_dialog.ui")] class SettingsDialog : Dialog { - [GtkChild] private CheckButton typing_checkbutton; - [GtkChild] private CheckButton marker_checkbutton; - [GtkChild] private CheckButton notification_checkbutton; - [GtkChild] private CheckButton emoji_checkbutton; - [GtkChild] private CheckButton check_spelling_checkbutton; + [GtkChild] private unowned CheckButton typing_checkbutton; + [GtkChild] private unowned CheckButton marker_checkbutton; + [GtkChild] private unowned CheckButton notification_checkbutton; + [GtkChild] private unowned CheckButton emoji_checkbutton; + [GtkChild] private unowned CheckButton check_spelling_checkbutton; Dino.Entities.Settings settings = Dino.Application.get_default().settings; diff --git a/plugins/omemo/src/logic/decrypt.vala b/plugins/omemo/src/logic/decrypt.vala index cfbb9c58..561e557b 100644 --- a/plugins/omemo/src/logic/decrypt.vala +++ b/plugins/omemo/src/logic/decrypt.vala @@ -129,13 +129,13 @@ namespace Dino.Plugins.Omemo { string identity_key = Base64.encode(msg.identity_key.serialize()); bool ok = update_db_for_prekey(identity_id, identity_key, from_jid, sid); - if (!ok) return null; + if (!ok) throw new GLib.Error(-1, 0, "Failed updating db for prekey"); debug("Starting new session for decryption with device from %s/%d", from_jid.to_string(), sid); SessionCipher cipher = store.create_session_cipher(address); key = cipher.decrypt_pre_key_signal_message(msg); // TODO: Finish session - } else { + } else { debug("Continuing session for decryption with device from %s/%d", from_jid.to_string(), sid); SignalMessage msg = Plugin.get_context().deserialize_signal_message(encrypted_key); SessionCipher cipher = store.create_session_cipher(address); diff --git a/plugins/omemo/src/ui/contact_details_dialog.vala b/plugins/omemo/src/ui/contact_details_dialog.vala index b3f8bc45..b268cc13 100644 --- a/plugins/omemo/src/ui/contact_details_dialog.vala +++ b/plugins/omemo/src/ui/contact_details_dialog.vala @@ -20,26 +20,26 @@ public class ContactDetailsDialog : Gtk.Dialog { private Signal.Store store; private Set<uint32> displayed_ids = new HashSet<uint32>(); - [GtkChild] private Label automatically_accept_new_label; - [GtkChild] private Label automatically_accept_new_descr; - [GtkChild] private Label own_key_label; - [GtkChild] private Label new_keys_label; - [GtkChild] private Label associated_keys_label; - [GtkChild] private Label inactive_expander_label; - - [GtkChild] private Box own_fingerprint_container; - [GtkChild] private Label own_fingerprint_label; - [GtkChild] private Box new_keys_container; - [GtkChild] private ListBox new_keys_listbox; - [GtkChild] private Box keys_container; - [GtkChild] private ListBox keys_listbox; - [GtkChild] private Expander inactive_keys_expander; - [GtkChild] private ListBox inactive_keys_listbox; - [GtkChild] private Switch auto_accept_switch; - [GtkChild] private Button copy_button; - [GtkChild] private Button show_qrcode_button; - [GtkChild] private Image qrcode_image; - [GtkChild] private Popover qrcode_popover; + [GtkChild] private unowned Label automatically_accept_new_label; + [GtkChild] private unowned Label automatically_accept_new_descr; + [GtkChild] private unowned Label own_key_label; + [GtkChild] private unowned Label new_keys_label; + [GtkChild] private unowned Label associated_keys_label; + [GtkChild] private unowned Label inactive_expander_label; + + [GtkChild] private unowned Box own_fingerprint_container; + [GtkChild] private unowned Label own_fingerprint_label; + [GtkChild] private unowned Box new_keys_container; + [GtkChild] private unowned ListBox new_keys_listbox; + [GtkChild] private unowned Box keys_container; + [GtkChild] private unowned ListBox keys_listbox; + [GtkChild] private unowned Expander inactive_keys_expander; + [GtkChild] private unowned ListBox inactive_keys_listbox; + [GtkChild] private unowned Switch auto_accept_switch; + [GtkChild] private unowned Button copy_button; + [GtkChild] private unowned Button show_qrcode_button; + [GtkChild] private unowned Image qrcode_image; + [GtkChild] private unowned Popover qrcode_popover; construct { // If we set the strings in the .ui file, they don't get translated diff --git a/plugins/omemo/src/ui/manage_key_dialog.vala b/plugins/omemo/src/ui/manage_key_dialog.vala index d2b69992..9bdaaaee 100644 --- a/plugins/omemo/src/ui/manage_key_dialog.vala +++ b/plugins/omemo/src/ui/manage_key_dialog.vala @@ -6,23 +6,23 @@ namespace Dino.Plugins.Omemo { [GtkTemplate (ui = "/im/dino/Dino/omemo/manage_key_dialog.ui")] public class ManageKeyDialog : Gtk.Dialog { - [GtkChild] private HeaderBar headerbar; - [GtkChild] private Stack manage_stack; + [GtkChild] private unowned HeaderBar headerbar; + [GtkChild] private unowned Stack manage_stack; - [GtkChild] private Button cancel_button; - [GtkChild] private Button ok_button; + [GtkChild] private unowned Button cancel_button; + [GtkChild] private unowned Button ok_button; - [GtkChild] private Label main_desc_label; - [GtkChild] private ListBox main_action_list; + [GtkChild] private unowned Label main_desc_label; + [GtkChild] private unowned ListBox main_action_list; - [GtkChild] private Image confirm_image; - [GtkChild] private Label confirm_title_label; - [GtkChild] private Label confirm_desc_label; + [GtkChild] private unowned Image confirm_image; + [GtkChild] private unowned Label confirm_title_label; + [GtkChild] private unowned Label confirm_desc_label; - [GtkChild] private Label verify_label; - [GtkChild] private Label compare_fingerprint_label; - [GtkChild] private Button verify_yes_button; - [GtkChild] private Button verify_no_button; + [GtkChild] private unowned Label verify_label; + [GtkChild] private unowned Label compare_fingerprint_label; + [GtkChild] private unowned Button verify_yes_button; + [GtkChild] private unowned Button verify_no_button; private Row device; private Database db; diff --git a/plugins/openpgp/src/account_settings_widget.vala b/plugins/openpgp/src/account_settings_widget.vala index 8a616ef5..7c417001 100644 --- a/plugins/openpgp/src/account_settings_widget.vala +++ b/plugins/openpgp/src/account_settings_widget.vala @@ -8,9 +8,9 @@ namespace Dino.Plugins.OpenPgp { [GtkTemplate (ui = "/im/dino/Dino/openpgp/account_settings_item.ui")] private class AccountSettingsWidget : Stack, Plugins.AccountSettingsWidget { - [GtkChild] private Label label; - [GtkChild] private Button button; - [GtkChild] private ComboBox combobox; + [GtkChild] private unowned Label label; + [GtkChild] private unowned Button button; + [GtkChild] private unowned ComboBox combobox; private Plugin plugin; private Account current_account; |