Index: schemas/desktop_gnome_applications_office.schemas.in
===================================================================
--- schemas/desktop_gnome_applications_office.schemas.in	(revision 0)
+++ schemas/desktop_gnome_applications_office.schemas.in	(revision 0)
@@ -0,0 +1,50 @@
+<?xml version="1.0"?>
+<gconfschemafile>
+  <schemalist>
+    <schema>
+      <key>/schemas/desktop/gnome/applications/calendar/exec</key>
+      <applyto>/desktop/gnome/applications/calendar/exec</applyto>
+      <owner>gnome</owner>
+      <type>string</type>
+      <default>evolution</default>
+      <locale name="C">
+        <short>Default calendar</short>
+        <long>Default calendar application</long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/desktop/gnome/applications/calendar/needs_term</key>
+      <applyto>/desktop/gnome/applications/calendar/needs_term</applyto>
+      <owner>gnome</owner>
+      <type>bool</type>
+      <default>false</default>
+      <locale name="C">
+        <short>Calendar needs terminal</short>
+        <long>Whether the default calendar application needs a terminal to run</long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/desktop/gnome/applications/tasks/exec</key>
+      <applyto>/desktop/gnome/applications/tasks/exec</applyto>
+      <owner>gnome</owner>
+      <type>string</type>
+      <default>evolution</default>
+      <locale name="C">
+        <short>Default tasks</short>
+        <long>Default tasks application</long>
+      </locale>
+    </schema>
+    <schema>
+      <key>/schemas/desktop/gnome/applications/tasks/needs_term</key>
+      <applyto>/desktop/gnome/applications/tasks/needs_term</applyto>
+      <owner>gnome</owner>
+      <type>bool</type>
+      <default>false</default>
+      <locale name="C">
+        <short>Tasks needs terminal</short>
+        <long>Whether the default tasks application needs a terminal to run</long>
+      </locale>
+    </schema>
+  </schemalist>
+</gconfschemafile>
Index: schemas/Makefile.am
===================================================================
--- schemas/Makefile.am	(revision 3551)
+++ schemas/Makefile.am	(working copy)
@@ -9,6 +9,7 @@
 	desktop_gnome_applications_help_viewer.schemas.in	\
 	desktop_gnome_applications_terminal.schemas.in		\
 	desktop_gnome_applications_window_manager.schemas.in	\
+	desktop_gnome_applications_office.schemas.in	\
 	desktop_gnome_file_views.schemas.in			\
 	desktop_gnome_lockdown.schemas.in			\
 	desktop_gnome_peripherals_mouse.schemas.in		\
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 3551)
+++ ChangeLog	(working copy)
@@ -1,3 +1,10 @@
+2007-11-15  Ross Burton  <ross@openedhand.com>
+
+	* schemas/desktop_gnome_applications_office.schemas.in:
+	* schemas/Makefile.am:
+	Add more default application schemas for office applications,
+	specifically "calendar" and "tasks".  Default these to evolution.
+
 2007-10-19  Tor Lillqvist  <tml@novell.com>
 
 	* libgnome/gnome-score.c: Map pipe() to _pipe() on Win32.
