From 5fc0435cc1227bf445d06a3931343020faaecd10 Mon Sep 17 00:00:00 2001 From: fiaxh Date: Thu, 9 Mar 2017 15:34:32 +0100 Subject: Save unsent messages (acc offline etc) and send later; don't send pgp messages if pgp error --- client/src/ui/conversation_summary/view.vala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'client/src/ui/conversation_summary/view.vala') diff --git a/client/src/ui/conversation_summary/view.vala b/client/src/ui/conversation_summary/view.vala index 0ea1a32c..59cf88aa 100644 --- a/client/src/ui/conversation_summary/view.vala +++ b/client/src/ui/conversation_summary/view.vala @@ -203,7 +203,8 @@ public class View : Box { return message_item != null && message_item.from.equals(message.from) && message_item.messages.get(0).encryption == message.encryption && - message.time.difference(message_item.initial_time) < TimeSpan.MINUTE; + message.time.difference(message_item.initial_time) < TimeSpan.MINUTE && + (message_item.messages.get(0).marked == Entities.Message.Marked.WONTSEND) == (message.marked == Entities.Message.Marked.WONTSEND); } private void force_alloc_width(Widget widget, int width) { -- cgit v1.2.3-54-g00ecf