diff options
| author | fiaxh <git@mx.ax.lt> | 2017-10-28 22:02:32 +0200 |
|---|---|---|
| committer | fiaxh <git@mx.ax.lt> | 2017-10-31 15:41:45 +0100 |
| commit | d9b91206c0291fa8aa58df572292784a4f8ff878 (patch) | |
| tree | 09721f9fdffbb87ec8ab25fd1c44a7bc535fffab /main/src/ui/conversation_list_titlebar.vala | |
| parent | 7e83529afcd0ccfff5c65c99e4427bd6cf3f82ac (diff) | |
| download | dino-d9b91206c0291fa8aa58df572292784a4f8ff878.tar.gz dino-d9b91206c0291fa8aa58df572292784a4f8ff878.zip | |
Keep MUC join dialog open until joined, show errors
Diffstat (limited to 'main/src/ui/conversation_list_titlebar.vala')
| -rw-r--r-- | main/src/ui/conversation_list_titlebar.vala | 10 |
1 files changed, 3 insertions, 7 deletions
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(); |