From: Matthew Barnes <mbarnes@redhat.com>
Date: Fri, 12 Nov 2010 19:46:25 +0000 (-0500)
Subject: Add GSettings schemas for default sources.
X-Git-Tag: upstream/3.7.4~875
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=138c1b04bb9fdb1ee2c76256d5ed6c403d4492c9;p=platform%2Fupstream%2Fevolution-data-server.git

Add GSettings schemas for default sources.

Schema: org.gnome.Evolution.DefaultSources
---

diff --git a/Makefile.am b/Makefile.am
index 04068a0..1d619ff 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS=-I m4
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --with-krb5=/usr --without-weather --enable-introspection
 
-SUBDIRS = camel private libedataserver libebackend addressbook calendar libedataserverui services tests docs art po
+SUBDIRS = camel data private libedataserver libebackend addressbook calendar libedataserverui services tests docs art po
 
 if HAVE_INTROSPECTION
 if HAVE_VALA
diff --git a/configure.ac b/configure.ac
index ac1c2b4..e1e7c41 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1537,6 +1537,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])
@@ -1632,6 +1642,7 @@ camel/tests/mime-filter/Makefile
 camel/tests/misc/Makefile
 camel/tests/smime/Makefile
 camel/camel.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..566afe9
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,10 @@
+gsettings_SCHEMAS = \
+	org.gnome.Evolution.DefaultSources.gschema.xml
+
+@GSETTINGS_RULES@
+
+EXTRA_DIST = $(gsettings_SCHEMAS)
+
+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..d252491
--- /dev/null
+++ b/data/org.gnome.Evolution.DefaultSources.gschema.xml
@@ -0,0 +1,31 @@
+<?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-mail-account' type='s'>
+      <default>'system'</default>
+      <summary>The UID of the default mail account</summary>
+    </key>
+    <key name='default-mail-identity' type='s'>
+      <default>''</default>
+      <summary>The UID of the default mail identity</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>