diff options
| author | fiaxh <git@mx.ax.lt> | 2017-03-24 22:57:05 +0100 |
|---|---|---|
| committer | fiaxh <git@mx.ax.lt> | 2017-03-31 01:21:35 +0200 |
| commit | 7d2f995a097086be01426cc79c9c801dabaf9e3b (patch) | |
| tree | 32b00adeaec82843a9f41fb3de17adc25e62fcc1 /main/src/ui/add_conversation | |
| parent | 3733d24a9066bdd3e038d642a62cf642abd0b0bf (diff) | |
| download | dino-7d2f995a097086be01426cc79c9c801dabaf9e3b.tar.gz dino-7d2f995a097086be01426cc79c9c801dabaf9e3b.zip | |
Fix conversation last_active
Diffstat (limited to 'main/src/ui/add_conversation')
| -rw-r--r-- | main/src/ui/add_conversation/chat/dialog.vala | 5 | ||||
| -rw-r--r-- | main/src/ui/add_conversation/conference/conference_list.vala | 12 |
2 files changed, 9 insertions, 8 deletions
diff --git a/main/src/ui/add_conversation/chat/dialog.vala b/main/src/ui/add_conversation/chat/dialog.vala index 15624731..910e7264 100644 --- a/main/src/ui/add_conversation/chat/dialog.vala +++ b/main/src/ui/add_conversation/chat/dialog.vala @@ -71,9 +71,8 @@ public class Dialog : Gtk.Dialog { protected void on_ok_button_clicked() { ListRow? selected_row = roster_list.get_selected_row() as ListRow; if (selected_row != null) { - // TODO move in list to front immediately - stream_interactor.get_module(ConversationManager.IDENTITY).ensure_start_conversation(selected_row.jid, selected_row.account); - Conversation conversation = stream_interactor.get_module(ConversationManager.IDENTITY).get_conversation(selected_row.jid, selected_row.account); + Conversation conversation = stream_interactor.get_module(ConversationManager.IDENTITY).create_conversation(selected_row.jid, selected_row.account, Conversation.Type.CHAT); + stream_interactor.get_module(ConversationManager.IDENTITY).start_conversation(conversation, true); conversation_opened(conversation); } close(); diff --git a/main/src/ui/add_conversation/conference/conference_list.vala b/main/src/ui/add_conversation/conference/conference_list.vala index c44f989a..d11271d8 100644 --- a/main/src/ui/add_conversation/conference/conference_list.vala +++ b/main/src/ui/add_conversation/conference/conference_list.vala @@ -43,11 +43,13 @@ protected class ConferenceList : FilterableList { } private static void on_conference_bookmarks_received(Core.XmppStream stream, ArrayList<Xep.Bookmarks.Conference> conferences, Object? o) { - Tuple<ConferenceList, Account> tuple = o as Tuple<ConferenceList, Account>; - ConferenceList list = tuple.a; - Account account = tuple.b; - list.lists[account] = conferences; - Idle.add(() => { list.refresh_conferences(); return false; }); + Idle.add(() => { + Tuple<ConferenceList, Account> tuple = o as Tuple<ConferenceList, Account>; + ConferenceList list = tuple.a; + Account account = tuple.b; + list.lists[account] = conferences; + list.refresh_conferences(); return false; + }); } private void header(ListBoxRow row, ListBoxRow? before_row) { |