Migrate mail prompts schemas to GSettings

5 files changed, 53 insertions, 1 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index 22de063b18..75a36d47e2 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -12,7 +12,8 @@ autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
 
 gsettings_SCHEMAS =					\
 	org.gnome.evolution.gschema.xml			\
-	org.gnome.evolution.addressbook.gschema.xml
+	org.gnome.evolution.addressbook.gschema.xml	\
+	org.gnome.evolution.mail.gschema.xml
 
 @INTLTOOL_XML_NOMERGE_RULE@
 
diff --git a/data/evolution.convert b/data/evolution.convert
index 0100bd94fe..4faa4e3a4b 100644
--- a/data/evolution.convert
+++ b/data/evolution.convert
@@ -30,3 +30,6 @@ layout = /apps/evolution/addressbook/display/layout
 hpane-position = /apps/evolution/addressbook/display/hpane_position
 vpane-position = /apps/evolution/addressbook/display/vpane_position
 show-preview = /apps/evolution/addressbook/display/show_preview
+
+[org.gnome.evolution.mail]
+check-if-default-mailer = /apps/evolution/mail/prompts/checkdefault
diff --git a/data/org.gnome.evolution.addressbook.gschema.xml.in b/data/org.gnome.evolution.addressbook.gschema.xml.in
new file mode 100644
index 0000000000..536841eee4
--- /dev/null
+++ b/data/org.gnome.evolution.addressbook.gschema.xml.in
@@ -0,0 +1,39 @@
+<schemalist>
+  <schema gettext-domain="evolution" id="org.gnome.evolution.addressbook" path="/apps/evolution/addressbook/">
+    <key name="completion-minimum-query-length" type="i">
+      <default>3</default>
+      <_summary>Autocomplete length</_summary>
+      <_description>The number of characters that must be typed before Evolution will attempt to autocomplete.</_description>
+    </key>
+    <key name="completion-show-address" type="b">
+      <default>false</default>
+      <_summary>Show autocompleted name with an address</_summary>
+      <_description>Whether force showing the mail address with the name of the autocompleted contact in the entry.</_description>
+    </key>
+    <key name="select-names-last-used-uri" type="s">
+      <default>''</default>
+      <_summary>URI for the folder last used in the select names dialog</_summary>
+      <_description>URI for the folder last used in the select names dialog.</_description>
+    </key>
+    <key name="layout" type="i">
+      <default>0</default>
+      <_summary>Contact layout style</_summary>
+      <_description>The layout style determines where to place the preview pane in relation to the contact list.  "0" (Classic View) places the preview pane below the contact list.  "1" (Vertical View) places the preview pane next to the contact list.</_description>
+    </key>
+    <key name="hpane-position" type="i">
+      <default>200</default>
+      <_summary>Contact preview pane position (horizontal)</_summary>
+      <_description>Position of the contact preview pane when oriented horizontally.</_description>
+    </key>
+    <key name="vpane-position" type="i">
+      <default>400</default>
+      <_summary>Contact preview pane position (vertical)</_summary>
+      <_description>Position of the contact preview pane when oriented vertically.</_description>
+    </key>
+    <key name="show-preview" type="b">
+      <default>true</default>
+      <_summary>Show preview pane</_summary>
+      <_description>Whether to show the preview pane.</_description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/data/org.gnome.evolution.schema.xml.in b/data/org.gnome.evolution.gschema.xml.in
index ab1316289d..ab1316289d 100644
--- a/data/org.gnome.evolution.schema.xml.in
+++ b/data/org.gnome.evolution.gschema.xml.in
diff --git a/data/org.gnome.evolution.mail.gschema.xml.in b/data/org.gnome.evolution.mail.gschema.xml.in
new file mode 100644
index 0000000000..df9d6c4d5c
--- /dev/null
+++ b/data/org.gnome.evolution.mail.gschema.xml.in
@@ -0,0 +1,9 @@
+<schemalist>
+  <schema gettext-domain="evolution" id="org.gnome.evolution.mail" path="/apps/evolution/mail/">
+    <key name="check-if-default-mailer" type="b">
+      <default>true</default>
+      <_summary>Check whether Evolution is the default mailer</_summary>
+      <_description>Every time Evolution starts, check whether or not it is the default mailer.</_description>
+    </key>
+  </schema>
+</schemalist>