[evolution-data-server/account-mgmt: 4/30] Add GSettings schemas for default sources.

[Matthew Barnes <mbarnes src gnome org>]

commit 61bab6e04581735d0e8989f62368ea1268c07550
Author: Matthew Barnes <mbarnes redhat com>
Date:   Fri Nov 12 14:46:25 2010 -0500

    Add GSettings schemas for default sources.
    
    Schema: org.gnome.Evolution.DefaultSources

 Makefile.am                                        |    4 +-
 configure.ac                                       |   20 +++++++++-------
 data/Makefile.am                                   |    8 +++++++
 .../org.gnome.Evolution.DefaultSources.gschema.xml |   23 ++++++++++++++++++++
 4 files changed, 44 insertions(+), 11 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 4c0278f..0e3d27b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,8 +6,8 @@ if ENABLE_CALENDAR
 CALENDAR_DIR = calendar
 endif
 
-SUBDIRS = libedataserver libebackend servers camel addressbook $(CALENDAR_DIR) libedataserverui docs art po
-DIST_SUBDIRS = libedataserver libebackend servers camel addressbook calendar libedataserverui docs art po
+SUBDIRS = data libedataserver libebackend servers camel addressbook $(CALENDAR_DIR) libedataserverui docs art po
+DIST_SUBDIRS = data libedataserver libebackend servers camel addressbook calendar libedataserverui docs art po
 
 %-$(API_VERSION).pc: %.pc
 	 cp $< $@
diff --git a/configure.ac b/configure.ac
index c1bb9b4..35f5c7f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1161,15 +1161,6 @@ else
 fi
 
 dnl ******************************
-dnl GObject marshalling
-dnl ******************************
-AM_PATH_GLIB_2_0
-
-dnl We use AC_SUBST_FILE because AC_SUBST won't deal with newlines
-EVO_MARSHAL_RULE=$srcdir/marshal.mk
-AC_SUBST_FILE(EVO_MARSHAL_RULE)
-
-dnl ******************************
 dnl Posix thread support
 dnl ******************************
 
@@ -1400,6 +1391,16 @@ AC_PATH_PROG(GCONFTOOL, gconftool-2, [no])
 AM_GCONF_SOURCE_2
 
 dnl ******************************
+dnl GLib stuff
+dnl ******************************
+GLIB_GSETTINGS
+AM_PATH_GLIB_2_0
+
+dnl We use AC_SUBST_FILE because AC_SUBST won't deal with newlines
+EVO_MARSHAL_RULE=$srcdir/marshal.mk
+AC_SUBST_FILE(EVO_MARSHAL_RULE)
+
+dnl ******************************
 dnl gperf stuff
 dnl ******************************
 AC_PATH_PROG(GPERF, gperf, [no])
@@ -1471,6 +1472,7 @@ camel/tests/misc/Makefile
 camel/tests/smime/Makefile
 camel/camel.pc
 camel/camel-provider.pc
+data/Makefile
 libebackend/Makefile
 libebackend/libebackend.pc
 libedataserver/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 0000000..b416bfc
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,8 @@
+gsettings_SCHEMAS = \
+	org.gnome.Evolution.DefaultSources.gschema.xml
+
+ GSETTINGS_RULES@
+
+CLEANFILES = $(gsettings_SCHEMAS:.xml=.valid)
+
+-include $(top_srcdir)/git.mk
diff --git a/data/org.gnome.Evolution.DefaultSources.gschema.xml b/data/org.gnome.Evolution.DefaultSources.gschema.xml
new file mode 100644
index 0000000..472c8cd
--- /dev/null
+++ b/data/org.gnome.Evolution.DefaultSources.gschema.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<schemalist>
+
+  <schema path="/org/gnome/evolution/" id="org.gnome.Evolution.DefaultSources">
+    <key name='default-address-book' type='s'>
+      <default>'system'</default>
+      <summary>The UID of the default address book</summary>
+    </key>
+    <key name='default-calendar' type='s'>
+      <default>'system'</default>
+      <summary>The UID of the default calendar</summary>
+    </key>
+    <key name='default-memo-list' type='s'>
+      <default>'system'</default>
+      <summary>The UID of the default memo list</summary>
+    </key>
+    <key name='default-task-list' type='s'>
+      <default>'system'</default>
+      <summary>The UID of the default task list</summary>
+    </key>
+  </schema>
+
+</schemalist>