diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/src/ui/add_conversation/add_groupchat_dialog.vala | 1 | ||||
| -rw-r--r-- | main/src/ui/chat_input/chat_input_controller.vala | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/main/src/ui/add_conversation/add_groupchat_dialog.vala b/main/src/ui/add_conversation/add_groupchat_dialog.vala index 7563da7f..46298d81 100644 --- a/main/src/ui/add_conversation/add_groupchat_dialog.vala +++ b/main/src/ui/add_conversation/add_groupchat_dialog.vala @@ -11,7 +11,6 @@ protected class AddGroupchatDialog : Gtk.Dialog { [GtkChild] private Stack accounts_stack; [GtkChild] private AccountComboBox account_combobox; - [GtkChild] private Label account_label; [GtkChild] private Button ok_button; [GtkChild] private Button cancel_button; [GtkChild] private Entry jid_entry; diff --git a/main/src/ui/chat_input/chat_input_controller.vala b/main/src/ui/chat_input/chat_input_controller.vala index 1ec7f3f8..533f6f0d 100644 --- a/main/src/ui/chat_input/chat_input_controller.vala +++ b/main/src/ui/chat_input/chat_input_controller.vala @@ -167,7 +167,7 @@ public class ChatInputController : Object { } private void update_moderated_input_status(Account account, Xmpp.Jid? jid = null) { - if (conversation.type_ == conversation.Type.GROUPCHAT){ + if (conversation != null && conversation.type_ == Conversation.Type.GROUPCHAT){ Xmpp.Jid? own_jid = stream_interactor.get_module(MucManager.IDENTITY).get_own_jid(conversation.counterpart, conversation.account); if (own_jid == null) return; if (stream_interactor.get_module(MucManager.IDENTITY).is_moderated_room(conversation.account, conversation.counterpart) && |