Remove the last remaining usage of GConf

4 files changed, 25 insertions, 0 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index ea2ca3f6a4..05a1d57f7a 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -31,6 +31,7 @@ gsettings_SCHEMAS =							\
 	org.gnome.evolution.plugin.itip.gschema.xml			\
 	org.gnome.evolution.plugin.mail-notification.gschema.xml	\
 	org.gnome.evolution.plugin.prefer-plain.gschema.xml		\
+	org.gnome.evolution.plugin.publish-calendar.gschema.xml		\
 	org.gnome.evolution.plugin.templates.gschema.xml
 
 @INTLTOOL_XML_NOMERGE_RULE@
diff --git a/data/evolution.convert b/data/evolution.convert
index c370cd8e59..a1ab31d5de 100644
--- a/data/evolution.convert
+++ b/data/evolution.convert
@@ -133,6 +133,8 @@ composer-spell-color = /apps/evolution/mail/composer/spell_color
 composer-spell-languages = /apps/evolution/mail/composer/spell_languages
 composer-top-signature = /apps/evolution/mail/composer/top_signature
 default-account = /apps/evolution/mail/default_account
+drag-and-drop-save-file-format = /apps/evolution/mail/save_file_format
+drag-and-drop-save-name-format = /apps/evolution/mail/save_name_format
 error-level = /apps/evolution/mail/display/error_level
 error-timeout = /apps/evolution/mail/display/error_timeout
 filters-log-actions = /apps/evolution/mail/filters/log
@@ -278,5 +280,8 @@ notify-status-notification = /apps/evolution/eplugin/mail-notification/status-no
 mode = /apps/evolution/eplugin/prefer_plain/mode
 show-suppressed = /apps/evolution/eplugin/prefer_plain/show_suppressed
 
+[org.gnome.evolution.plugin.publish-calendar]
+uris = /apps/evolution/calendar/publish/uris
+
 [org.gnome.evolution.plugin.templates]
 template-placeholders = /apps/evolution/mail/template_placeholders
diff --git a/data/org.gnome.evolution.mail.gschema.xml.in b/data/org.gnome.evolution.mail.gschema.xml.in
index 42593bb894..0e83413a97 100644
--- a/data/org.gnome.evolution.mail.gschema.xml.in
+++ b/data/org.gnome.evolution.mail.gschema.xml.in
@@ -130,6 +130,16 @@
       <_summary>List of localized 'Re'</_summary>
       <_description>Comma-separated list of localized 'Re' abbreviations to skip in a subject text when replying to a message, as an addition to the standard "Re" prefix. An example is 'SV,AV'.</_description>
     </key>
+    <key name="drag-and-drop-save-file-format" type="s">
+      <default>'mbox'</default>
+      <_summary>Save file format for drag-and-drop operation</_summary>
+      <_description>Can be either 'mbox' or 'pdf'.</_description>
+    </key>
+    <key name="drag-and-drop-save-name-format" type="i">
+      <default>1</default>
+      <_summary>Save name format for drag-and-drop operation</_summary>
+      <_description>Can be either 2 to use current date and time or any other value for sent date of the message. This has a meaning only when dropping just one message.</_description>
+    </key>
     <key name="show-animated-images" type="b">
       <default>false</default>
       <_summary>Show image animations</_summary>
diff --git a/data/org.gnome.evolution.plugin.publish-calendar.gschema.xml.in b/data/org.gnome.evolution.plugin.publish-calendar.gschema.xml.in
new file mode 100644
index 0000000000..00073d2dc3
--- /dev/null
+++ b/data/org.gnome.evolution.plugin.publish-calendar.gschema.xml.in
@@ -0,0 +1,9 @@
+<schemalist>
+  <schema gettext-domain="evolution" id="org.gnome.evolution.plugin.publish-calendar" path="/org/gnome/evolution/plugin/publish-calendar/">
+    <key name="uris" type="as">
+      <default>[]</default>
+      <_summary>List of Destinations for publishing</_summary>
+      <_description>The key specifies the list of destinations to where publish calendars. Each values specifies an XML with setup for publishing to one destination.</_description>
+    </key>
+  </schema>
+</schemalist>