>From 0aae38f7363e12dd36790855cda0081dc19c020a Mon Sep 17 00:00:00 2001 From: Mattias Eriksson Date: Tue, 18 Feb 2014 21:38:57 +0100 Subject: [PATCH] Make Gmail accounts always show images --- src/client/conversation-viewer/conversation-viewer.vala | 2 +- src/engine/abstract/geary-abstract-account.vala | 2 ++ src/engine/api/geary-account.vala | 1 + src/engine/imap-engine/gmail/imap-engine-gmail-account.vala | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/client/conversation-viewer/conversation-viewer.vala b/src/client/conversation-viewer/conversation-viewer.vala index d81fb1c..5533995 100644 --- a/src/client/conversation-viewer/conversation-viewer.vala +++ b/src/client/conversation-viewer/conversation-viewer.vala @@ -513,7 +513,7 @@ public class ConversationViewer : Gtk.Box { email.get_primary_originator()); bool always_load = contact != null && contact.always_load_remote_images(); - if (always_load || email.load_remote_images().is_certain()) { + if (always_load || email.load_remote_images().is_certain() || current_folder.account.have_safe_remote_images) { show_images_email(div_message, false); } else { WebKit.DOM.HTMLElement remote_images_bar = diff --git a/src/engine/abstract/geary-abstract-account.vala b/src/engine/abstract/geary-abstract-account.vala index 7c194f8..1e5ee3e 100644 --- a/src/engine/abstract/geary-abstract-account.vala +++ b/src/engine/abstract/geary-abstract-account.vala @@ -12,6 +12,7 @@ public abstract class Geary.AbstractAccount : BaseObject, Geary.Account { public Geary.ProgressMonitor sending_monitor { get; protected set; } public virtual bool can_support_archive { get; protected set; } + public virtual bool have_safe_remote_images { get; protected set; } private string name; @@ -19,6 +20,7 @@ public abstract class Geary.AbstractAccount : BaseObject, Geary.Account { this.name = name; this.information = information; this.can_support_archive = can_support_archive; + this.have_safe_remote_images = false; } protected virtual void notify_folders_available_unavailable(Gee.List? available, diff --git a/src/engine/api/geary-account.vala b/src/engine/api/geary-account.vala index a144566..ed02dc1 100644 --- a/src/engine/api/geary-account.vala +++ b/src/engine/api/geary-account.vala @@ -22,6 +22,7 @@ public interface Geary.Account : BaseObject { public abstract Geary.ProgressMonitor opening_monitor { get; protected set; } public abstract Geary.ProgressMonitor sending_monitor { get; protected set; } + public abstract bool have_safe_remote_images { get; protected set;} /** * HACK: for now, only certain account types support folders with * FolderSupport.Archive. It's useful to know whether an account supports diff --git a/src/engine/imap-engine/gmail/imap-engine-gmail-account.vala b/src/engine/imap-engine/gmail/imap-engine-gmail-account.vala index aad5ea4..c60ff06 100644 --- a/src/engine/imap-engine/gmail/imap-engine-gmail-account.vala +++ b/src/engine/imap-engine/gmail/imap-engine-gmail-account.vala @@ -39,6 +39,7 @@ private class Geary.ImapEngine.GmailAccount : Geary.ImapEngine.GenericAccount { public GmailAccount(string name, Geary.AccountInformation account_information, Imap.Account remote, ImapDB.Account local) { base (name, account_information, true, remote, local); + this.have_safe_remote_images = true; if (path_type_map == null) { path_type_map = new Gee.HashMap(); -- 1.8.5.3