anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Don't show conversations from account after it was disabled

Browse source 
fixes #277
This commit is contained in:
fiaxh 2019-08-27 22:12:18 +02:00
parent d02f7b6a3a
commit e52a4eacb2
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libdino/src/service/conversation_manager.vala
View file

@ -26,6 +26,7 @@ public class ConversationManager : StreamInteractionModule, Object {
this.stream_interactor = stream_interactor;
stream_interactor.add_module(this);
stream_interactor.account_added.connect(on_account_added);
stream_interactor.account_removed.connect(on_account_removed);
stream_interactor.get_module(MessageProcessor.IDENTITY).received_pipeline.connect(new MessageListener(stream_interactor));
stream_interactor.get_module(MessageProcessor.IDENTITY).message_sent.connect(handle_sent_message);
}
@ -136,6 +137,14 @@ public class ConversationManager : StreamInteractionModule, Object {
}
}
private void on_account_removed(Account account) {
foreach (Gee.List<Conversation> list in conversations[account].values) {
foreach (var conversation in list) {
if(conversation.active) conversation_deactivated(conversation);
}
}
}
private class MessageListener : Dino.MessageListener {
public string[] after_actions_const = new string[]{ "DEDUPLICATE", "FILTER_EMPTY" };

2
main/src/ui/conversation_selector/conversation_selector.vala
View file

@ -93,7 +93,7 @@ public class ConversationSelector : ListBox {
private void remove_conversation(Conversation conversation) {
select_fallback_conversation(conversation);
if (rows.has_key(conversation) && !conversation.active) {
if (rows.has_key(conversation)) {
remove(rows[conversation]);
rows.unset(conversation);
}

1
main/src/ui/manage_accounts/dialog.vala
View file

@ -173,7 +173,6 @@ public class Dialog : Gtk.Dialog {
private bool change_account_state(bool state) {
selected_account.enabled = state;
if (state) {
if (selected_account.enabled) account_disabled(selected_account);
account_enabled(selected_account);
} else {
account_disabled(selected_account);