5 files changed, 46 insertions, 4 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index a31232a3e..f2095524e 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,12 +1,20 @@
 SUBDIRS = sources
 
-gsettings_SCHEMAS = \
-	org.gnome.Evolution.DefaultSources.gschema.xml
+gsettings_SCHEMAS =						\
+	org.gnome.Evolution.DefaultSources.gschema.xml		\
+	org.gnome.evolution-data-server.calendar.gschema.xml	\
+	org.gnome.evolution-data-server.addressbook.gschema.xml
+
+@INTLTOOL_XML_NOMERGE_RULE@
 
 @GSETTINGS_RULES@
 
-EXTRA_DIST = $(gsettings_SCHEMAS)
+convertdir = $(datadir)/GConf/gsettings
+convert_DATA = evolution-data-server.convert
+
+EXTRA_DIST = $(gsettings_SCHEMAS:.xml=.xml.in) \
+	     $(convert_DATA)
 
-CLEANFILES = $(gsettings_SCHEMAS:.xml=.valid)
+CLEANFILES = $(gsettings_SCHEMAS)
 
 -include $(top_srcdir)/git.mk
diff --git a/data/evolution-data-server.convert b/data/evolution-data-server.convert
new file mode 100644
index 000000000..1c398486f
--- /dev/null
+++ b/data/evolution-data-server.convert
@@ -0,0 +1,7 @@
+[org.gnome.evolution-data-server.addressbook]
+self-contact-uid = /apps/evolution/addressbook/self/self_uid
+
+[org.gnome.evolution-data-server.calendar]
+contacts-reminder-enabled = /apps/evolution/calendar/other/use_ba_reminder
+contacts-reminder-interval = /apps/evolution/calendar/other/ba_reminder_interval
+contacts-reminder-units = /apps/evolution/calendar/other/ba_reminder_units
diff --git a/data/org.gnome.Evolution.DefaultSources.gschema.xml b/data/org.gnome.Evolution.DefaultSources.gschema.xml.in
index d252491ba..d252491ba 100644
--- a/data/org.gnome.Evolution.DefaultSources.gschema.xml
+++ b/data/org.gnome.Evolution.DefaultSources.gschema.xml.in
diff --git a/data/org.gnome.evolution-data-server.addressbook.gschema.xml.in b/data/org.gnome.evolution-data-server.addressbook.gschema.xml.in
new file mode 100644
index 000000000..f010d318e
--- /dev/null
+++ b/data/org.gnome.evolution-data-server.addressbook.gschema.xml.in
@@ -0,0 +1,8 @@
+<schemalist>
+  <schema gettext-domain="evolution-data-server" id="org.gnome.evolution-data-server.addressbook" path="/org/gnome/evolution-data-server/addressbook/">
+    <key name="self-contact-uid" type="s">
+      <default>''</default>
+      <_summary>Contact UID of a user</_summary>
+    </key>
+  </schema>
+</schemalist>
diff --git a/data/org.gnome.evolution-data-server.calendar.gschema.xml.in b/data/org.gnome.evolution-data-server.calendar.gschema.xml.in
new file mode 100644
index 000000000..4f65e0140
--- /dev/null
+++ b/data/org.gnome.evolution-data-server.calendar.gschema.xml.in
@@ -0,0 +1,19 @@
+<schemalist>
+  <schema gettext-domain="evolution-data-server" id="org.gnome.evolution-data-server.calendar" path="/org/gnome/evolution-data-server/calendar/">
+    <key name="contacts-reminder-enabled" type="b">
+      <default>false</default>
+      <_summary>Birthday and anniversary reminder</_summary>
+      <_description>Whether to set a reminder for birthdays and anniversaries</_description>
+    </key>
+    <key name="contacts-reminder-interval" type="i">
+      <default>15</default>
+      <_summary>Birthday and anniversary reminder value</_summary>
+      <_description>Number of units for determining a birthday or anniversary reminder</_description>
+    </key>
+    <key name="contacts-reminder-units" type="s">
+      <default>'minutes'</default>
+      <_summary>Birthday and anniversary reminder units</_summary>
+      <_description>Units for a birthday or anniversary reminder, "minutes", "hours" or "days"</_description>
+    </key>
+  </schema>
+</schemalist>