diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2013-03-10 22:10:47 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2013-03-17 20:49:12 +0800 |
| commit | c8bbe0df730a8252f062b0aaf98adac9aabd7542 (patch) | |
| tree | 29c3a294a04869631a8e31f22069ec8ccad9ff56 /data | |
| parent | 3b205698762afcd86ac79595960253d84aff5487 (diff) | |
| download | gsoc2013-evolution-c8bbe0df730a8252f062b0aaf98adac9aabd7542.tar gsoc2013-evolution-c8bbe0df730a8252f062b0aaf98adac9aabd7542.tar.gz gsoc2013-evolution-c8bbe0df730a8252f062b0aaf98adac9aabd7542.tar.bz2 gsoc2013-evolution-c8bbe0df730a8252f062b0aaf98adac9aabd7542.tar.lz gsoc2013-evolution-c8bbe0df730a8252f062b0aaf98adac9aabd7542.tar.xz gsoc2013-evolution-c8bbe0df730a8252f062b0aaf98adac9aabd7542.tar.zst gsoc2013-evolution-c8bbe0df730a8252f062b0aaf98adac9aabd7542.zip | |
Add "forward-style-name" setting.
Replaces the "forward-style" setting, which is now deprecated.
The new setting uses an enum type compatible with EMailForwardStyle.
Diffstat (limited to 'data')
| -rw-r--r-- | data/org.gnome.evolution.mail.gschema.xml.in | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/data/org.gnome.evolution.mail.gschema.xml.in b/data/org.gnome.evolution.mail.gschema.xml.in index 7ac3df8fd7..69c5799872 100644 --- a/data/org.gnome.evolution.mail.gschema.xml.in +++ b/data/org.gnome.evolution.mail.gschema.xml.in @@ -1,4 +1,12 @@ <schemalist> + + <!-- Keep this synchronized with EMailForwardStyle. --> + <enum id="org.gnome.evolution.mail.ForwardStyle"> + <value nick='attached' value='0'/> + <value nick='inline' value='1'/> + <value nick='quoted' 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> @@ -335,10 +343,9 @@ <_summary>Flush Outbox after filtering</_summary> <_description>Whether to flush Outbox after filtering is done. Outbox flush will happen only when there was used any 'Forward to' filter action and approximately one minute after the last action invocation.</_description> </key> - <key name="forward-style" type="i"> - <default>0</default> + <key name="forward-style-name" enum="org.gnome.evolution.mail.ForwardStyle"> + <default>'attached'</default> <_summary>Default forward style</_summary> - <_description></_description> </key> <key name="reply-style" type="i"> <default>0</default> @@ -536,5 +543,15 @@ <child name="send-recv-window" schema="org.gnome.evolution.window"/> <child name="subscription-window" schema="org.gnome.evolution.window"/> <child name="vfolder-window" schema="org.gnome.evolution.window"/> + + <!-- The following keys are deprecated. --> + + <key name="forward-style" type="i"> + <default>0</default> + <_summary>(Deprecated) Default forward style</_summary> + <_description>This key was deprecated in version 3.10 and should no longer be used. Use "forward-style-name" instead.</_description> + </key> + </schema> + </schemalist> |