diff options
| author | fiaxh <git@mx.ax.lt> | 2017-03-09 15:34:32 +0100 |
|---|---|---|
| committer | fiaxh <git@mx.ax.lt> | 2017-03-09 15:45:03 +0100 |
| commit | 5fc0435cc1227bf445d06a3931343020faaecd10 (patch) | |
| tree | 329041d3b2545fc445e9f175d3d5fff755fd110b /client/src/ui/conversation_summary/view.vala | |
| parent | b1e6e51c4f79f57f0a01b183ef185408fb22cc36 (diff) | |
| download | dino-5fc0435cc1227bf445d06a3931343020faaecd10.tar.gz dino-5fc0435cc1227bf445d06a3931343020faaecd10.zip | |
Save unsent messages (acc offline etc) and send later; don't send pgp messages if pgp error
Diffstat (limited to 'client/src/ui/conversation_summary/view.vala')
| -rw-r--r-- | client/src/ui/conversation_summary/view.vala | 3 |
1 files changed, 2 insertions, 1 deletions
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) { |