From 54bb7dd76c8c698eb69bd7460cf74551c182b439 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sun, 10 Mar 2013 10:45:23 -0400
Subject: Add "reply-style-name" setting.

Replaces the "reply-style" setting, which is now deprecated.

The new setting uses an enum type compatible with EMailReplyStyle.
---
 data/org.gnome.evolution.mail.gschema.xml.in | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

(limited to 'data')

diff --git a/data/org.gnome.evolution.mail.gschema.xml.in b/data/org.gnome.evolution.mail.gschema.xml.in
index 69c5799872..c3e26f313c 100644
--- a/data/org.gnome.evolution.mail.gschema.xml.in
+++ b/data/org.gnome.evolution.mail.gschema.xml.in
@@ -7,6 +7,14 @@
     <value nick='quoted'   value='2'/>
   </enum>
 
+  <!-- Keep this synchronized with EMailReplyStyle. -->
+  <enum id="org.gnome.evolution.mail.ReplyStyle">
+    <value nick='quoted'       value='0'/>
+    <value nick='do-not-quote' value='1'/>
+    <value nick='attach'       value='2'/>
+    <value nick='outlook'      value='3'/>
+  </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>
@@ -347,10 +355,9 @@
       <default>'attached'</default>
       <_summary>Default forward style</_summary>
     </key>
-    <key name="reply-style" type="i">
-      <default>0</default>
-      <_summary>Default forward style</_summary>
-      <_description></_description>
+    <key name="reply-style-name" enum="org.gnome.evolution.mail.ReplyStyle">
+      <default>'quoted'</default>
+      <_summary>Default reply style</_summary>
     </key>
     <key name="prompt-on-empty-subject" type="b">
       <default>true</default>
@@ -551,6 +558,11 @@
       <_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>
+    <key name="reply-style" type="i">
+      <default>0</default>
+      <_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>
 
   </schema>
 
-- 
cgit v1.2.3