aboutsummaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorfiaxh <git@lightrise.org>2019-12-23 21:53:45 +0100
committerfiaxh <git@lightrise.org>2019-12-24 01:46:01 +0100
commitf58119f25e42da7a21e2c4324b305cc8c5fb6760 (patch)
treedd90ba816025d07ebdcfe818538b8d0d8996d186 /main
parent1d1682a357b6ab1ac709160560b43c23ee7163b5 (diff)
downloaddino-f58119f25e42da7a21e2c4324b305cc8c5fb6760.tar.gz
dino-f58119f25e42da7a21e2c4324b305cc8c5fb6760.zip
Don't show own typing notifications (other devices)
fixes #669
Diffstat (limited to 'main')
-rw-r--r--main/src/ui/conversation_summary/chat_state_populator.vala1
-rw-r--r--main/src/ui/conversation_summary/conversation_view.vala4
2 files changed, 1 insertions, 4 deletions
diff --git a/main/src/ui/conversation_summary/chat_state_populator.vala b/main/src/ui/conversation_summary/chat_state_populator.vala
index 04eb4a20..5db2a1f6 100644
--- a/main/src/ui/conversation_summary/chat_state_populator.vala
+++ b/main/src/ui/conversation_summary/chat_state_populator.vala
@@ -80,7 +80,6 @@ class ChatStatePopulator : Plugins.ConversationItemPopulator, Plugins.Conversati
meta_item = new MetaChatStateItem(stream_interactor, current_conversation, jid, state_type, jids);
item_collection.insert_item(meta_item);
}
-
}
}
diff --git a/main/src/ui/conversation_summary/conversation_view.vala b/main/src/ui/conversation_summary/conversation_view.vala
index 9b90622a..4cde3668 100644
--- a/main/src/ui/conversation_summary/conversation_view.vala
+++ b/main/src/ui/conversation_summary/conversation_view.vala
@@ -72,6 +72,7 @@ public class ConversationView : Box, Plugins.ConversationItemCollection, Plugins
firstLoad = false;
}
stack.set_visible_child_name("void");
+ clear();
initialize_for_conversation_(conversation);
display_latest();
stack.set_visible_child_name("main");
@@ -136,7 +137,6 @@ public class ConversationView : Box, Plugins.ConversationItemCollection, Plugins
clear_notifications();
this.conversation = conversation;
-
// Init for new conversation
foreach (Plugins.ConversationItemPopulator populator in app.plugin_registry.conversation_addition_populators) {
populator.init(conversation, this, Plugins.WidgetType.GTK);
@@ -149,8 +149,6 @@ public class ConversationView : Box, Plugins.ConversationItemCollection, Plugins
}
private void display_latest() {
- clear();
-
Gee.List<ContentMetaItem> items = content_populator.populate_latest(conversation, 40);
foreach (ContentMetaItem item in items) {
do_insert_item(item);