diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2013-03-11 08:11:48 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2013-03-17 20:49:12 +0800 |
commit | 69cf1ede0d8dbeee486fd3693fba42f2ccea8bf6 (patch) | |
tree | 77a2f75d2abf1f1c030bac6ec5c568f1af33d04b /data | |
parent | 54bb7dd76c8c698eb69bd7460cf74551c182b439 (diff) | |
download | gsoc2013-evolution-69cf1ede0d8dbeee486fd3693fba42f2ccea8bf6.tar gsoc2013-evolution-69cf1ede0d8dbeee486fd3693fba42f2ccea8bf6.tar.gz gsoc2013-evolution-69cf1ede0d8dbeee486fd3693fba42f2ccea8bf6.tar.bz2 gsoc2013-evolution-69cf1ede0d8dbeee486fd3693fba42f2ccea8bf6.tar.lz gsoc2013-evolution-69cf1ede0d8dbeee486fd3693fba42f2ccea8bf6.tar.xz gsoc2013-evolution-69cf1ede0d8dbeee486fd3693fba42f2ccea8bf6.tar.zst gsoc2013-evolution-69cf1ede0d8dbeee486fd3693fba42f2ccea8bf6.zip |
Add "image-loading-policy" setting.
Replaces the "load-http-images" setting, which is now deprecated.
The new setting uses an enum type compatible with EMailImageLoadingPolicy.
Diffstat (limited to 'data')
-rw-r--r-- | data/org.gnome.evolution.mail.gschema.xml.in | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/data/org.gnome.evolution.mail.gschema.xml.in b/data/org.gnome.evolution.mail.gschema.xml.in index c3e26f313c..59914ce09f 100644 --- a/data/org.gnome.evolution.mail.gschema.xml.in +++ b/data/org.gnome.evolution.mail.gschema.xml.in @@ -15,6 +15,13 @@ <value nick='outlook' value='3'/> </enum> + <!-- Keep this synchronized with EMailImageLoadingPolicy. --> + <enum id="org.gnome.evolution.mail.ImageLoadingPolicy"> + <value nick='never' value='0'/> + <value nick='sometimes' value='1'/> + <value nick='always' value='2'/> + </enum> + <schema gettext-domain="evolution" id="org.gnome.evolution.mail" path="/org/gnome/evolution/mail/"> <key name="prompt-check-if-default-mailer" type="b"> <default>true</default> @@ -201,15 +208,9 @@ <_summary>Default charset in which to display messages</_summary> <_description>Default charset in which to display messages.</_description> </key> - <key name="load-http-images" type="i"> - <default>0</default> - <_summary>Load images for HTML messages over HTTP</_summary> - <_description> - Load images for HTML messages over HTTP(S). Possible values are: - "0" - Never load images off the net. - "1" - Load images in messages from contacts. - "2" - Always load images off the net. - </_description> + <key name="image-loading-policy" enum="org.gnome.evolution.mail.ImageLoadingPolicy"> + <default>'never'</default> + <_summary>Automatically load images for HTML messages over HTTP</_summary> </key> <key name="animate-images" type="b"> <default>true</default> @@ -563,6 +564,11 @@ <_summary>(Deprecated) Default reply style</_summary> <_description>This key was deprecated in version 3.10 and should no longer be used. Use "reply-style-name" instead.</_description> </key> + <key name="load-http-images" type="i"> + <default>0</default> + <_summary>(Deprecated) Load images for HTML messages over HTTP</_summary> + <_description>This key was deprecated in version 3.10 and should no longer be used. Use "image-loading-policy" instead.</_description> + </key> </schema> |