diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2013-11-11 21:19:09 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2013-11-11 21:29:20 +0800 |
| commit | 4ea43b34a81b03f9f98fffe3bd63c14185055d7d (patch) | |
| tree | 211b5b2cb172979383ef8ec430d1ad4ae521576e /em-format | |
| parent | 9c1975632e679406e93d860703760c76fcd20814 (diff) | |
| download | gsoc2013-evolution-4ea43b34a81b03f9f98fffe3bd63c14185055d7d.tar gsoc2013-evolution-4ea43b34a81b03f9f98fffe3bd63c14185055d7d.tar.gz gsoc2013-evolution-4ea43b34a81b03f9f98fffe3bd63c14185055d7d.tar.bz2 gsoc2013-evolution-4ea43b34a81b03f9f98fffe3bd63c14185055d7d.tar.lz gsoc2013-evolution-4ea43b34a81b03f9f98fffe3bd63c14185055d7d.tar.xz gsoc2013-evolution-4ea43b34a81b03f9f98fffe3bd63c14185055d7d.tar.zst gsoc2013-evolution-4ea43b34a81b03f9f98fffe3bd63c14185055d7d.zip | |
Move EMailImageLoadingPolicy to e-mail-formatter-enums.h.
libemail-engine doesn't need to know about this enum.
Diffstat (limited to 'em-format')
| -rw-r--r-- | em-format/e-mail-formatter-enums.h | 18 | ||||
| -rw-r--r-- | em-format/e-mail-formatter.c | 13 | ||||
| -rw-r--r-- | em-format/e-mail-formatter.h | 1 |
3 files changed, 24 insertions, 8 deletions
diff --git a/em-format/e-mail-formatter-enums.h b/em-format/e-mail-formatter-enums.h index e1b41d6cf6..c7922acf95 100644 --- a/em-format/e-mail-formatter-enums.h +++ b/em-format/e-mail-formatter-enums.h @@ -62,6 +62,24 @@ typedef enum { /*< flags >*/ } EMailFormatterQuoteFlags; /** + * EMailImageLoadingPolicy: + * @E_MAIL_IMAGE_LOADING_POLICY_NEVER: + * Never load images from a remote server. + * @E_MAIL_IMAGE_LOADING_POLICY_SOMETIMES: + * Only load images from a remote server if the sender is a known contact. + * @E_MAIL_IMAGE_LOADING_POLICY_ALWAYS: + * Always load images from a remote server. + * + * Policy for loading remote image URLs in email. Allowing images to be + * loaded from a remote server may have privacy implications. + **/ +typedef enum { + E_MAIL_IMAGE_LOADING_POLICY_NEVER, + E_MAIL_IMAGE_LOADING_POLICY_SOMETIMES, + E_MAIL_IMAGE_LOADING_POLICY_ALWAYS +} EMailImageLoadingPolicy; + +/** * EMailParserExtensionFlags: * @E_MAIL_PARSER_EXTENSION_INLINE: * Don't parse as attachment. diff --git a/em-format/e-mail-formatter.c b/em-format/e-mail-formatter.c index 68313a2632..2f201dd07e 100644 --- a/em-format/e-mail-formatter.c +++ b/em-format/e-mail-formatter.c @@ -18,16 +18,15 @@ #include "e-mail-formatter.h" -#include "e-mail-formatter-extension.h" -#include "e-mail-formatter-utils.h" -#include "e-mail-part.h" +#include <gdk/gdk.h> +#include <libebackend/libebackend.h> #include <e-util/e-util.h> -#include <libebackend/libebackend.h> -#include <gdk/gdk.h> -#include <glib/gi18n.h> -#include "libemail-engine/e-mail-engine-enumtypes.h" +#include "e-mail-formatter-enumtypes.h" +#include "e-mail-formatter-extension.h" +#include "e-mail-formatter-utils.h" +#include "e-mail-part.h" #define d(x) diff --git a/em-format/e-mail-formatter.h b/em-format/e-mail-formatter.h index 734bcbe8db..4986c0956d 100644 --- a/em-format/e-mail-formatter.h +++ b/em-format/e-mail-formatter.h @@ -20,7 +20,6 @@ #define E_MAIL_FORMATTER_H_ #include <gdk/gdk.h> -#include <libemail-engine/e-mail-engine-enums.h> #include <em-format/e-mail-extension-registry.h> #include <em-format/e-mail-formatter-enums.h> |