diff options
| author | fiaxh <git@mx.ax.lt> | 2017-12-17 13:15:53 +0100 |
|---|---|---|
| committer | fiaxh <git@mx.ax.lt> | 2017-12-30 13:10:06 +0100 |
| commit | 8cbc4e7f892e08cc18552e6a41fc752c22e082ba (patch) | |
| tree | deb14de2e5bac14f111d8148e46f641a97dd43fc | |
| parent | b4bb0912fc328bc44b13e190f59b347eb5d4310a (diff) | |
| download | dino-8cbc4e7f892e08cc18552e6a41fc752c22e082ba.tar.gz dino-8cbc4e7f892e08cc18552e6a41fc752c22e082ba.zip | |
Clear chat states on own/contact disconnect
fixes #197
| -rw-r--r-- | libdino/src/service/counterpart_interaction_manager.vala | 2 | ||||
| -rw-r--r-- | main/src/ui/conversation_summary/default_file_display.vala | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libdino/src/service/counterpart_interaction_manager.vala b/libdino/src/service/counterpart_interaction_manager.vala index bde60889..e4207a1c 100644 --- a/libdino/src/service/counterpart_interaction_manager.vala +++ b/libdino/src/service/counterpart_interaction_manager.vala @@ -27,9 +27,11 @@ public class CounterpartInteractionManager : StreamInteractionModule, Object { stream_interactor.account_added.connect(on_account_added); stream_interactor.get_module(MessageProcessor.IDENTITY).message_received.connect(on_message_received); stream_interactor.get_module(MessageProcessor.IDENTITY).message_sent.connect(check_if_got_marker); + stream_interactor.stream_negotiated.connect(() => chat_states.clear() ); } public string? get_chat_state(Account account, Jid jid) { + if (stream_interactor.connection_manager.get_state(account) != ConnectionManager.ConnectionState.CONNECTED) return null; return chat_states[jid]; } diff --git a/main/src/ui/conversation_summary/default_file_display.vala b/main/src/ui/conversation_summary/default_file_display.vala index 413871ca..c919b1dd 100644 --- a/main/src/ui/conversation_summary/default_file_display.vala +++ b/main/src/ui/conversation_summary/default_file_display.vala @@ -39,7 +39,6 @@ public class DefaultFileDisplay : Plugins.MetaConversationItem { public override Object? get_widget(Plugins.WidgetType widget_type) { Box main_box = new Box(Orientation.HORIZONTAL, 4) { halign=Align.START, visible=true }; - string? content_type = ContentType.from_mime_type(file_transfer.mime_type); string? icon_name = ContentType.get_generic_icon_name(file_transfer.mime_type); Image content_type_image = new Image.from_icon_name(icon_name, IconSize.DND) { visible=true }; main_box.add(content_type_image); |