From d2a5287effcf60a44084568a37c9c9091d336178 Mon Sep 17 00:00:00 2001 From: fiaxh Date: Thu, 31 Aug 2017 18:40:58 +0200 Subject: Use utc time everywhere --- main/src/ui/conversation_summary/conversation_view.vala | 4 ++-- main/src/ui/conversation_summary/file_populator.vala | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'main/src/ui/conversation_summary') diff --git a/main/src/ui/conversation_summary/conversation_view.vala b/main/src/ui/conversation_summary/conversation_view.vala index 370f7943..9379e8ba 100644 --- a/main/src/ui/conversation_summary/conversation_view.vala +++ b/main/src/ui/conversation_summary/conversation_view.vala @@ -134,11 +134,11 @@ public class ConversationView : Box, Plugins.ConversationItemCollection { Dino.Application app = Dino.Application.get_default(); if (item_skeletons.size == 1) { foreach (Plugins.ConversationItemPopulator populator in app.plugin_registry.conversation_item_populators) { - populator.populate_between_widgets(conversation, item.sort_time, new DateTime.now_utc()); + populator.populate_timespan(conversation, item.sort_time, new DateTime.now_utc()); } } else { foreach (Plugins.ConversationItemPopulator populator in app.plugin_registry.conversation_item_populators) { - populator.populate_between_widgets(conversation, item.sort_time, meta_items.higher(item).sort_time); + populator.populate_timespan(conversation, item.sort_time, meta_items.higher(item).sort_time); } } } diff --git a/main/src/ui/conversation_summary/file_populator.vala b/main/src/ui/conversation_summary/file_populator.vala index bdaeaa41..9046155a 100644 --- a/main/src/ui/conversation_summary/file_populator.vala +++ b/main/src/ui/conversation_summary/file_populator.vala @@ -31,15 +31,15 @@ class FilePopulator : Plugins.ConversationItemPopulator, Object { public void close(Conversation conversation) { } - public void populate_timespan(Conversation conversation, DateTime from, DateTime to) { } - - public void populate_between_widgets(Conversation conversation, DateTime from, DateTime to) { + public void populate_timespan(Conversation conversation, DateTime from, DateTime to) { Gee.List transfers = stream_interactor.get_module(FileManager.IDENTITY).get_file_transfers(conversation.account, conversation.counterpart, from, to); foreach (FileTransfer transfer in transfers) { insert_file(transfer); } } + public void populate_between_widgets(Conversation conversation, DateTime from, DateTime to) { } + private void insert_file(FileTransfer transfer) { if (transfer.mime_type.has_prefix("image")) { item_collection.insert_item(new ImageItem(stream_interactor, transfer)); -- cgit v1.2.3-70-g09d2