[geary/wip/765516-gtk-widget-conversation-viewer: 104/117] Fix logic error when determining when to show the "show images" infobar.
- From: Michael Gratton <mjog src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [geary/wip/765516-gtk-widget-conversation-viewer: 104/117] Fix logic error when determining when to show the "show images" infobar.
- Date: Wed, 10 Aug 2016 00:27:24 +0000 (UTC)
commit d57f96f49985cc0228122a78d5cfbadbe9f99eeb
Author: Michael James Gratton <mike vee net>
Date: Tue Jul 26 16:31:56 2016 +1000
Fix logic error when determining when to show the "show images" infobar.
.../conversation-viewer/conversation-message.vala | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/src/client/conversation-viewer/conversation-message.vala
b/src/client/conversation-viewer/conversation-message.vala
index 7049cba..3e2caf4 100644
--- a/src/client/conversation-viewer/conversation-message.vala
+++ b/src/client/conversation-viewer/conversation-message.vala
@@ -348,13 +348,15 @@ public class ConversationMessage : Gtk.Box {
body_text = clean_html_markup(body_text ?? "", message, out load_images);
if (load_images) {
- Geary.Contact contact =
- contact_store.get_by_rfc822(message.get_primary_originator());
- bool contact_load = contact != null && contact.always_load_remote_images();
- if (contact_load || always_load_remote_images) {
- load_images = true;
- } else {
+ bool contact_load = false;
+ Geary.Contact contact = this.contact_store.get_by_rfc822(
+ message.get_primary_originator()
+ );
+ if (contact != null)
+ contact_load = contact.always_load_remote_images();
+ if (!contact_load && !this.always_load_remote_images) {
remote_images_infobar.show();
+ load_images = false;
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]