aboutsummaryrefslogtreecommitdiff
path: root/client/src/ui/conversation_summary
diff options
context:
space:
mode:
authorfiaxh <git@mx.ax.lt>2017-03-09 15:34:32 +0100
committerfiaxh <git@mx.ax.lt>2017-03-09 15:45:03 +0100
commit5fc0435cc1227bf445d06a3931343020faaecd10 (patch)
tree329041d3b2545fc445e9f175d3d5fff755fd110b /client/src/ui/conversation_summary
parentb1e6e51c4f79f57f0a01b183ef185408fb22cc36 (diff)
downloaddino-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')
-rw-r--r--client/src/ui/conversation_summary/merged_message_item.vala8
-rw-r--r--client/src/ui/conversation_summary/view.vala3
2 files changed, 9 insertions, 2 deletions
diff --git a/client/src/ui/conversation_summary/merged_message_item.vala b/client/src/ui/conversation_summary/merged_message_item.vala
index b1e99d3e..b73e8b4f 100644
--- a/client/src/ui/conversation_summary/merged_message_item.vala
+++ b/client/src/ui/conversation_summary/merged_message_item.vala
@@ -68,10 +68,16 @@ public class MergedMessageItem : Grid {
}
private void update_received() {
+ received_image.visible = true;
bool all_received = true;
bool all_read = true;
foreach (Message message in messages) {
- if (message.marked != Message.Marked.READ) {
+ if (message.marked == Message.Marked.WONTSEND) {
+ Gtk.IconTheme icon_theme = Gtk.IconTheme.get_default();
+ Gtk.IconInfo? icon_info = icon_theme.lookup_icon("dialog-warning-symbolic", IconSize.SMALL_TOOLBAR, 0);
+ received_image.set_from_pixbuf(icon_info.load_symbolic({1,0,0,1}));
+ return;
+ } else if (message.marked != Message.Marked.READ) {
all_read = false;
if (message.marked != Message.Marked.RECEIVED) {
all_received = false;
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) {