From d9b91206c0291fa8aa58df572292784a4f8ff878 Mon Sep 17 00:00:00 2001 From: fiaxh Date: Sat, 28 Oct 2017 22:02:32 +0200 Subject: Keep MUC join dialog open until joined, show errors --- main/src/ui/conversation_list_titlebar.vala | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'main/src/ui/conversation_list_titlebar.vala') diff --git a/main/src/ui/conversation_list_titlebar.vala b/main/src/ui/conversation_list_titlebar.vala index 815807f2..e499c6d5 100644 --- a/main/src/ui/conversation_list_titlebar.vala +++ b/main/src/ui/conversation_list_titlebar.vala @@ -26,13 +26,9 @@ public class ConversationListTitlebar : Gtk.HeaderBar { private void create_add_menu(Window window) { SimpleAction contacts_action = new SimpleAction("add_chat", null); contacts_action.activate.connect(() => { - AddConversation.Chat.Dialog add_chat_dialog = new AddConversation.Chat.Dialog(stream_interactor, stream_interactor.get_accounts()); + AddChatDialog add_chat_dialog = new AddChatDialog(stream_interactor, stream_interactor.get_accounts()); add_chat_dialog.set_transient_for(window); - add_chat_dialog.title = _("Start Chat"); - add_chat_dialog.ok_button.label = _("Start"); - add_chat_dialog.selected.connect((account, jid) => { - Conversation conversation = stream_interactor.get_module(ConversationManager.IDENTITY).create_conversation(jid, account, Conversation.Type.CHAT); - stream_interactor.get_module(ConversationManager.IDENTITY).start_conversation(conversation, true); + add_chat_dialog.added.connect((conversation) => { conversation_opened(conversation); }); add_chat_dialog.present(); @@ -41,7 +37,7 @@ public class ConversationListTitlebar : Gtk.HeaderBar { SimpleAction conference_action = new SimpleAction("add_conference", null); conference_action.activate.connect(() => { - AddConversation.Conference.Dialog add_conference_dialog = new AddConversation.Conference.Dialog(stream_interactor); + AddConferenceDialog add_conference_dialog = new AddConferenceDialog(stream_interactor); add_conference_dialog.set_transient_for(window); add_conference_dialog.conversation_opened.connect((conversation) => conversation_opened(conversation)); add_conference_dialog.present(); -- cgit v1.2.3-70-g09d2