Start settings schemas migration

3 files changed, 80 insertions, 1 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index 3b17a94a3a..ccc209616b 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -10,6 +10,16 @@ autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
 
 @INTLTOOL_DESKTOP_RULE@
 
+gsettings_SCHEMAS =				\
+	org.gnome.evolution.gschema.xml
+
+@INTLTOOL_XML_NOMERGE_RULE@
+
+@GSETTINGS_RULES@
+
+convertdir = $(datadir)/GConf/gsettings
+convert_DATA = evolution.convert
+
 mimedir = $(datadir)/mime-info
 dist_mime_DATA = evolution.mime
 
@@ -54,6 +64,11 @@ CLEANFILES =					\
 
 EXTRA_DIST =					\
 	$(autostart_in_files)			\
-	$(desktop_in_files)
+	$(desktop_in_files)			\
+	$(convert_DATA)				\
+	$(gsettings_SCHEMAS:.xml=.xml.in.in)
+
+DISTCLEANFILES =		\
+	$(gsettings_SCHEMAS)
 
 -include $(top_srcdir)/git.mk
diff --git a/data/evolution.convert b/data/evolution.convert
new file mode 100644
index 0000000000..da4b1e405b
--- /dev/null
+++ b/data/evolution.convert
@@ -0,0 +1,12 @@
+[org.gnome.evolution]
+version = /apps/evolution/version
+last-upgraded-version = /apps/evolution/last_version
+
+[org.gnome.evolution.shell]
+skip-warning-dialog = /apps/evolution/shell/skip_warning_dialog
+attachment-view = /apps/evolution/shell/attachment_view
+file-chooser-folder = /apps/evolution/shell/file_chooser_folder
+start-offline = /apps/evolution/shell/start_offline
+folder-paths = /apps/evolution/shell/offline/folder_paths
+express-mode = /apps/evolution/shell/express_mode
+window-y = /apps/evolution/shell/view_defaults/window_y
diff --git a/data/org.gnome.evolution.schema.xml.in b/data/org.gnome.evolution.schema.xml.in
new file mode 100644
index 0000000000..8a7653454c
--- /dev/null
+++ b/data/org.gnome.evolution.schema.xml.in
@@ -0,0 +1,52 @@
+<schemalist>
+  <schema gettext-domain="evolution" id="org.gnome.evolution" path="/apps/evolution/">
+    <child name="shell" schema="org.gnome.evolution.shell"/>
+    <key name="version" type="s">
+      <default>''</default>
+      <_summary>Configuration version</_summary>
+      <_description>The configuration version of Evolution, with major/minor/configuration level (for example "2.6.0").</_description>
+    </key>
+    <key name="last-upgraded-version" type="s">
+      <default>''</default>
+      <_summary>Last upgraded configuration version</_summary>
+      <_description>The last upgraded configuration version of Evolution, with major/minor/configuration level (for example "2.6.0").</_description>
+    </key>
+  </schema>
+  <schema gettext-domain="evolution" id="org.gnome.evolution.shell" path="/apps/evolution/shell/">
+    <key name="skip-warning-dialog" type="b">
+      <default>false</default>
+      <_summary>Skip development warning dialog</_summary>
+      <_description>Whether the warning dialog in development versions of Evolution is skipped.</_description>
+    </key>
+    <key name="attachment-view" type="i">
+      <default>0</default>
+      <_summary>Initial attachment view</_summary>
+      <_description>Initial view for attachment bar widgets. "0" is Icon View, "1" is List View.</_description>
+    </key>
+    <key name="file-chooser-folder" type="s">
+      <default>''</default>
+      <_summary>Initial file chooser folder</_summary>
+      <_description>Initial folder for GtkFileChooser dialogs.</_description>
+    </key>
+    <key name="start-offline" type="b">
+      <default>false</default>
+      <_summary>Start in offline mode</_summary>
+      <_description> Whether Evolution will start up in offline mode instead of online mode.</_description>
+    </key>
+    <key name="folder-paths" type="as">
+      <default>[]</default>
+      <_summary>Offline folder paths</_summary>
+      <_description>List of paths for the folders to be synchronized to disk for offline usage.</_description>
+    </key>
+    <key name="express-mode" type="b">
+      <default>false</default>
+      <_summary>Enable express mode</_summary>
+      <_description>Flag that enables a much simplified user interface.</_description>
+    </key>
+    <key name="window-y" type="i">
+      <default></default>
+      <_summary>Default window Y coordinate</_summary>
+      <_description>The default Y coordinate for the main window.</_description>
+    </key>
+  </schema>
+</schemalist>