Remove the last remaining usage of GConf

19 files changed, 119 insertions, 1351 deletions

diff --git a/modules/addressbook/Makefile.am b/modules/addressbook/Makefile.am
index f02d942b69..533a4bbb9a 100644
--- a/modules/addressbook/Makefile.am
+++ b/modules/addressbook/Makefile.am
@@ -82,46 +82,11 @@ module_addressbook_la_LIBADD = \
 module_addressbook_la_LDFLAGS = \
 	-module -avoid-version $(NO_UNDEFINED)
 
-# GConf schemas
-
-schemadir   = $(GCONF_SCHEMA_FILE_DIR)
-schema_in_files = apps_evolution_addressbook.schemas.in
-schema_DATA = $(schema_in_files:.schemas.in=.schemas)
-
-@INTLTOOL_SCHEMAS_RULE@
-
-if GCONF_SCHEMAS_INSTALL
-
-if OS_WIN32
-install-data-local:
-	if test -z "$(DESTDIR)" ; then							\
-		for p in $(schema_DATA) ; do						\
-			(echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE);	\
-			 echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat;	\
-			cmd /c _temp.bat; 						\
-			rm _temp.bat;							\
-		done									\
-	fi
-else
-install-data-local:
-	if test -z "$(DESTDIR)" ; then							\
-		for p in $(schema_DATA) ; do						\
-			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) 		\
-				$(GCONFTOOL) --makefile-install-rule $$p;		\
-		done									\
-	fi
-endif
-
-endif
-
 ui_DATA =			\
 	ldap-config.ui
 
-DISTCLEANFILES = $(schema_DATA)
-
 EXTRA_DIST =			\
 	$(ui_DATA)		\
-	$(schema_in_files)	\
 	openldap-extract.h
 
 dist-hook:
diff --git a/modules/addressbook/apps_evolution_addressbook.schemas.in b/modules/addressbook/apps_evolution_addressbook.schemas.in
deleted file mode 100644
index cf9f098e90..0000000000
--- a/modules/addressbook/apps_evolution_addressbook.schemas.in
+++ /dev/null
@@ -1,155 +0,0 @@
-<gconfschemafile>
-  <schemalist>
-
-    <!-- Completion uris -->
-
-    <schema>
-      <key>/schemas/apps/evolution/addressbook/completion/uris</key>
-      <applyto>/apps/evolution/addressbook/completion/uris</applyto>
-      <owner>evolution-addressbook</owner>
-      <type>string</type>
-      <default></default>
-      <locale name="C">
-        <short>EFolderList XML for the list of completion URIs</short>
-        <long>EFolderList XML for the list of completion URIs.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/addressbook/completion/minimum_query_length</key>
-      <applyto>/apps/evolution/addressbook/completion/minimum_query_length</applyto>
-      <owner>evolution-addressbook</owner>
-      <type>int</type>
-      <default>3</default>
-      <locale name="C">
-        <short>Autocomplete length</short>
-        <long>The number of characters that must be typed before Evolution will attempt to autocomplete.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/addressbook/completion/show_address</key>
-      <applyto>/apps/evolution/addressbook/completion/show_address</applyto>
-      <owner>evolution-addressbook</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Show autocompleted name with an address</short>
-        <long>Whether force showing the mail address with the name of the autocompleted contact in the entry.</long>
-      </locale>
-    </schema>
-
-    <!-- Select names last used uri -->
-
-    <schema>
-      <key>/schemas/apps/evolution/addressbook/select_names/last_used_uri</key>
-      <applyto>/apps/evolution/addressbook/select_names/last_used_uri</applyto>
-      <owner>evolution-addressbook</owner>
-      <type>string</type>
-      <default></default>
-      <locale name="C">
-        <short>URI for the folder last used in the select names dialog</short>
-        <long>URI for the folder last used in the select names dialog.</long>
-      </locale>
-    </schema>
-
-    <!-- View state -->
-
-    <schema>
-      <key>/schemas/apps/evolution/addressbook/display/layout</key>
-      <applyto>/apps/evolution/addressbook/display/layout</applyto>
-      <owner>evolution-addressbook</owner>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-        <short>Contact layout style</short>
-        <long>
-          The layout style determines where to place the preview pane
-          in relation to the contact list.  "0" (Classic View) places
-          the preview pane below the contact list.  "1" (Vertical View)
-          places the preview pane next to the contact list.
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/addressbook/display/primary_addressbook</key>
-      <applyto>/apps/evolution/addressbook/display/primary_addressbook</applyto>
-      <owner>evolution-addressbook</owner>
-      <type>string</type>
-      <default></default>
-      <locale name="C">
-        <short>Primary address book</short>
-        <long>
-          The UID of the selected (or "primary") address book in the
-          sidebar of the "Contacts" view.
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/addressbook/display/hpane_position</key>
-      <applyto>/apps/evolution/addressbook/display/hpane_position</applyto>
-      <owner>evolution-addressbook</owner>
-      <type>int</type>
-      <default>200</default>
-      <locale name="C">
-        <short>Contact preview pane position (horizontal)</short>
-        <long>
-          Position of the contact preview pane when oriented horizontally.
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/addressbook/display/vpane_position</key>
-      <applyto>/apps/evolution/addressbook/display/vpane_position</applyto>
-      <owner>evolution-addressbook</owner>
-      <type>int</type>
-      <default>400</default>
-      <locale name="C">
-        <short>Contact preview pane position (vertical)</short>
-        <long>
-          Position of the contact preview pane when oriented vertically.
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/addressbook/display/show_preview</key>
-      <applyto>/apps/evolution/addressbook/display/show_preview</applyto>
-      <owner>evolution-addressbook</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>Show preview pane</short> 
-         <long>Whether to show the preview pane.</long>
-      </locale>
-    </schema>
-    
-    <schema>
-      <key>/schemas/apps/evolution/addressbook/display/preview_show_maps</key>
-      <applyto>/apps/evolution/addressbook/display/preview_show_maps</applyto>
-      <owner>evolution-addressbook</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-      	<short>Show maps</short>
-      	<long>Whether to show maps in preview pane.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/addressbook/display/address_formatting</key>
-      <applyto>/apps/evolution/addressbook/display/address_formatting</applyto>
-      <owner>evolution-addressbook</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Enable address formatting</short>
-        <long>Whether addresses should be formatted according to standard in their destination country.</long>
-      </locale>
-    </schema>
-
-  </schemalist>
-</gconfschemafile>
diff --git a/modules/backup-restore/evolution-backup-tool.c b/modules/backup-restore/evolution-backup-tool.c
index 7d1caaf948..d09efa3628 100644
--- a/modules/backup-restore/evolution-backup-tool.c
+++ b/modules/backup-restore/evolution-backup-tool.c
@@ -53,8 +53,14 @@
 #define EVOLUTION "evolution"
 #define EVOLUTION_DIR "$DATADIR/"
 #define EVOLUTION_DIR_FILE EVOLUTION ".dir"
-#define GCONF_DUMP_FILE "backup-restore-gconf.xml"
-#define GCONF_DIR "/apps/evolution"
+
+#define ANCIENT_GCONF_DUMP_FILE "backup-restore-gconf.xml"
+
+#define DCONF_DUMP_FILE_EDS "backup-restore-dconf-eds.ini"
+#define DCONF_DUMP_FILE_EVO "backup-restore-dconf-evo.ini"
+
+#define DCONF_PATH_EDS "/org/gnome/evolution-data-server/"
+#define DCONF_PATH_EVO "/org/gnome/evolution/"
 
 static gboolean backup_op = FALSE;
 static gchar *bk_file = NULL;
@@ -313,10 +319,15 @@ backup (const gchar *filename,
 		return;
 
 	txt = _("Backing Evolution accounts and settings");
-	run_cmd ("gconftool-2 --dump " GCONF_DIR " > " EVOLUTION_DIR GCONF_DUMP_FILE);
+	run_cmd ("dconf dump " DCONF_PATH_EDS " >" EVOLUTION_DIR DCONF_DUMP_FILE_EDS);
+	run_cmd ("dconf dump " DCONF_PATH_EVO " >" EVOLUTION_DIR DCONF_DUMP_FILE_EVO);
+
+	replace_in_file (
+		EVOLUTION_DIR DCONF_DUMP_FILE_EDS,
+		e_get_user_data_dir (), EVOUSERDATADIR_MAGIC);
 
 	replace_in_file (
-		EVOLUTION_DIR GCONF_DUMP_FILE,
+		EVOLUTION_DIR DCONF_DUMP_FILE_EVO,
 		e_get_user_data_dir (), EVOUSERDATADIR_MAGIC);
 
 	write_dir_file ();
@@ -514,17 +525,35 @@ restore (const gchar *filename,
 
 	if (is_new_format) {
 		/* new format has it in DATADIR... */
-		replace_in_file (
-			EVOLUTION_DIR GCONF_DUMP_FILE,
-			EVOUSERDATADIR_MAGIC, e_get_user_data_dir ());
-		run_cmd ("gconftool-2 --load " EVOLUTION_DIR GCONF_DUMP_FILE);
-		run_cmd ("rm " EVOLUTION_DIR GCONF_DUMP_FILE);
+		GString *file = replace_variables (EVOLUTION_DIR ANCIENT_GCONF_DUMP_FILE);
+		if (file && g_file_test (file->str, G_FILE_TEST_EXISTS)) {
+			/* ancient backup */
+			replace_in_file (
+				EVOLUTION_DIR ANCIENT_GCONF_DUMP_FILE,
+				EVOUSERDATADIR_MAGIC, e_get_user_data_dir ());
+			run_cmd ("gconftool-2 --load " EVOLUTION_DIR ANCIENT_GCONF_DUMP_FILE);
+			run_cmd ("rm " EVOLUTION_DIR ANCIENT_GCONF_DUMP_FILE);
+		} else {
+			replace_in_file (
+				EVOLUTION_DIR DCONF_DUMP_FILE_EDS,
+				EVOUSERDATADIR_MAGIC, e_get_user_data_dir ());
+			run_cmd ("cat " EVOLUTION_DIR DCONF_DUMP_FILE_EDS " | dconf load " DCONF_PATH_EDS);
+			run_cmd ("rm " EVOLUTION_DIR DCONF_DUMP_FILE_EDS);
+
+			replace_in_file (
+				EVOLUTION_DIR DCONF_DUMP_FILE_EVO,
+				EVOUSERDATADIR_MAGIC, e_get_user_data_dir ());
+			run_cmd ("cat " EVOLUTION_DIR DCONF_DUMP_FILE_EVO " | dconf load " DCONF_PATH_EVO);
+			run_cmd ("rm " EVOLUTION_DIR DCONF_DUMP_FILE_EVO);
+		}
+
+		g_string_free (file, TRUE);
 	} else {
 		gchar *gconf_dump_file;
 
 		/* ... old format in ~/.evolution */
 		gconf_dump_file = g_build_filename (
-			"$HOME", ".evolution", GCONF_DUMP_FILE, NULL);
+			"$HOME", ".evolution", ANCIENT_GCONF_DUMP_FILE, NULL);
 
 		replace_in_file (
 			gconf_dump_file,
@@ -635,9 +664,19 @@ check (const gchar *filename,
 
 	command = g_strdup_printf (
 		"tar ztf %s | grep -e \"^\\.evolution/%s$\"",
-		quotedfname, GCONF_DUMP_FILE);
+		quotedfname, ANCIENT_GCONF_DUMP_FILE);
 	result = system (command);
 	g_free (command);
+
+	if (result != 0) {
+		/* maybe it's an ancient backup */
+		command = g_strdup_printf (
+			"tar ztf %s | grep -e \"^\\.evolution/%s$\"",
+			quotedfname, ANCIENT_GCONF_DUMP_FILE);
+		result = system (command);
+		g_free (command);
+	}
+
 	g_free (quotedfname);
 
 	g_message ("Third result %d", result);
diff --git a/modules/bogofilter/Makefile.am b/modules/bogofilter/Makefile.am
index 225e2a47c7..aaa72f977d 100644
--- a/modules/bogofilter/Makefile.am
+++ b/modules/bogofilter/Makefile.am
@@ -22,38 +22,4 @@ module_bogofilter_la_LIBADD = \
 module_bogofilter_la_LDFLAGS = \
 	-module -avoid-version $(NO_UNDEFINED)
 
-schemadir = $(GCONF_SCHEMA_FILE_DIR)
-schema_in_files = evolution-bogofilter.schemas.in
-schema_DATA = $(schema_in_files:.schemas.in=.schemas)
-
-@INTLTOOL_SCHEMAS_RULE@
-
-if GCONF_SCHEMAS_INSTALL
-
-if OS_WIN32
-install-data-local:
-	if test -z "$(DESTDIR)" ; then							\
-		for p in $(schema_DATA) ; do						\
-			(echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE);	\
-			 echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat;	\
-			cmd /c _temp.bat; 						\
-			rm _temp.bat;							\
-		done									\
-	fi
-else
-install-data-local:
-	if test -z "$(DESTDIR)" ; then							\
-		for p in $(schema_DATA) ; do						\
-			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) 		\
-				$(GCONFTOOL) --makefile-install-rule $$p;		\
-		done									\
-	fi
-endif
-
-endif
-
-DISTCLEANFILES = $(schema_DATA)
-
-EXTRA_DIST = $(schema_in_files)
-
 -include $(top_srcdir)/git.mk
diff --git a/modules/bogofilter/evolution-bogofilter.schemas.in b/modules/bogofilter/evolution-bogofilter.schemas.in
deleted file mode 100644
index e313eb9ffc..0000000000
--- a/modules/bogofilter/evolution-bogofilter.schemas.in
+++ /dev/null
@@ -1,20 +0,0 @@
-<gconfschemafile>
-  <schemalist>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/junk/bogofilter/unicode</key>
-      <applyto>/apps/evolution/mail/junk/bogofilter/unicode</applyto>
-      <owner>evolution-bogofilter</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Convert mail messages to Unicode</short>
-        <long>
-          Convert message text to Unicode UTF-8 to unify spam/ham tokens
-          coming from different character sets.
-        </long>
-      </locale>
-    </schema>
-
-  </schemalist>
-</gconfschemafile>
diff --git a/modules/calendar/Makefile.am b/modules/calendar/Makefile.am
index 43465f39fe..0bcc72cfde 100644
--- a/modules/calendar/Makefile.am
+++ b/modules/calendar/Makefile.am
@@ -102,39 +102,9 @@ module_calendar_la_LIBADD = \
 module_calendar_la_LDFLAGS = \
 	-module -avoid-version $(NO_UNDEFINED)
 
-schemadir = $(GCONF_SCHEMA_FILE_DIR)
-schema_in_files = apps_evolution_calendar.schemas.in
-schema_DATA = $(schema_in_files:.schemas.in=.schemas)
-@INTLTOOL_SCHEMAS_RULE@
-
 ui_DATA = e-calendar-preferences.ui
 
 EXTRA_DIST =			\
-	$(schema_in_files)	\
 	$(ui_DATA)
 
-DISTCLEANFILES = $(schema_DATA)
-
-if GCONF_SCHEMAS_INSTALL
-if OS_WIN32
-install-data-local:
-	if test -z "$(DESTDIR)" ; then							\
-		for p in $(schema_DATA) ; do						\
-			(echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE);	\
-			 echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat;	\
-			cmd /c _temp.bat; 						\
-			rm _temp.bat;							\
-		done									\
-	fi
-else
-install-data-local:
-	if test -z "$(DESTDIR)" ; then							\
-		for p in $(schema_DATA) ; do						\
-			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) 		\
-				$(GCONFTOOL) --makefile-install-rule $$p;		\
-		done									\
-	fi
-endif
-endif
-
 -include $(top_srcdir)/git.mk
diff --git a/modules/calendar/apps_evolution_calendar.schemas.in b/modules/calendar/apps_evolution_calendar.schemas.in
deleted file mode 100644
index c34852ed4e..0000000000
--- a/modules/calendar/apps_evolution_calendar.schemas.in
+++ /dev/null
@@ -1,839 +0,0 @@
-<gconfschemafile>
-  <schemalist>
-
-    <!-- Display -->
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/primary_calendar</key>
-      <applyto>/apps/evolution/calendar/display/primary_calendar</applyto>
-      <owner>evolution-calendar</owner>
-      <type>string</type>
-      <default></default>
-      <locale name="C">
-        <short>Primary calendar</short>
-        <long>
-          The UID of the selected (or "primary") calendar in the
-          sidebar of the "Calendar" view.
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/timezone</key>
-      <applyto>/apps/evolution/calendar/display/timezone</applyto>
-      <owner>evolution-calendar</owner>
-      <type>string</type>
-      <default>UTC</default>
-      <locale name="C">
-        <short>Timezone</short>
-        <long>The default timezone to use for dates and times in the calendar, as an untranslated Olsen timezone database location like "America/New York".</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/use_system_timezone</key>
-      <applyto>/apps/evolution/calendar/display/use_system_timezone</applyto>
-      <owner>evolution-calendar</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Use system timezone</short>
-        <long>Use the system timezone instead of the timezone selected
-        in Evolution.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/day_second_zone</key>
-      <applyto>/apps/evolution/calendar/display/day_second_zone</applyto>
-      <owner>evolution-calendar</owner>
-      <type>string</type>
-      <default></default>
-      <locale name="C">
-        <short>The second timezone for a Day View</short>
-        <long>Shows the second time zone in a Day View, if set. Value is similar to one used in a 'timezone' key.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/day_second_zones</key>
-      <applyto>/apps/evolution/calendar/display/day_second_zones</applyto>
-      <owner>evolution-calendar</owner>
-      <type>list</type>
-      <list_type>string</list_type>
-      <default>[]</default>
-      <locale name="C">
-        <short>Recently used second time zones in a Day View</short>
-        <long>List of recently used second time zones in a Day View.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/day_second_zones_max</key>
-      <applyto>/apps/evolution/calendar/display/day_second_zones_max</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>5</default>
-      <locale name="C">
-        <short>Maximum number of recently used timezones to remember.</short>
-        <long>Maximum number of recently used timezones to remember in a 'day_second_zones' list.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/use_24hour_format</key>
-      <applyto>/apps/evolution/calendar/display/use_24hour_format</applyto>
-      <owner>evolution-calendar</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Twenty four hour time format</short>
-        <long>Whether to show times in twenty four hour format instead of using am/pm.</long>
-      </locale>
-    </schema>
- 
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/show_role</key>
-      <applyto>/apps/evolution/calendar/display/show_role</applyto>
-      <owner>evolution-calendar</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Show Role field in the event/task/meeting editor</short>
-        <long>Whether to show role field in the event/task/meeting editor</long>
-      </locale>
-    </schema>
-
-     <schema>
-      <key>/schemas/apps/evolution/calendar/display/show_status</key>
-      <applyto>/apps/evolution/calendar/display/show_status</applyto>
-      <owner>evolution-calendar</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Show status field in the event/task/meeting editor</short>
-        <long>Whether to show status field in the event/task/meeting editor</long>
-      </locale>
-    </schema>
-
-     <schema>
-      <key>/schemas/apps/evolution/calendar/display/show_type</key>
-      <applyto>/apps/evolution/calendar/display/show_type</applyto>
-      <owner>evolution-calendar</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Show type field in the event/task/meeting editor</short>
-        <long>Whether to show type field in the event/task/meeting editor</long>
-      </locale>
-    </schema>
-
-     <schema>
-      <key>/schemas/apps/evolution/calendar/display/show_rsvp</key>
-      <applyto>/apps/evolution/calendar/display/show_rsvp</applyto>
-      <owner>evolution-calendar</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Show RSVP field in the event/task/meeting editor</short>
-        <long>Whether to show RSVP field in the event/task/meeting editor</long>
-      </locale>
-    </schema>
-
-     <schema>
-      <key>/schemas/apps/evolution/calendar/display/show_timezone</key>
-      <applyto>/apps/evolution/calendar/display/show_timezone</applyto>
-      <owner>evolution-calendar</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Show timezone field in the event/meeting editor</short>
-        <long>Whether to show timezone field in the event/meeting editor</long>
-      </locale>
-    </schema>
-
-     <schema>
-      <key>/schemas/apps/evolution/calendar/display/show_categories</key>
-      <applyto>/apps/evolution/calendar/display/show_categories</applyto>
-      <owner>evolution-calendar</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Show categories field in the event/meeting/task editor</short>
-        <long>Whether to show categories field in the event/meeting editor</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/week_start_day</key>
-      <applyto>/apps/evolution/calendar/display/week_start_day</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>1</default>
-      <locale name="C">
-        <short>Week start</short>
-        <long>Weekday the week starts on, from Sunday (0) to Saturday (6).</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/day_start_hour</key>
-      <applyto>/apps/evolution/calendar/display/day_start_hour</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>9</default>
-      <locale name="C">
-        <short>Workday start hour</short>
-        <long>Hour the workday starts on, in twenty four hour format, 0 to 23.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/day_start_minute</key>
-      <applyto>/apps/evolution/calendar/display/day_start_minute</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-        <short>Workday start minute</short>
-        <long>Minute the workday starts on, 0 to 59.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/day_end_hour</key>
-      <applyto>/apps/evolution/calendar/display/day_end_hour</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>17</default>
-      <locale name="C">
-        <short>Workday end hour</short>
-        <long>Hour the workday ends on, in twenty four hour format, 0 to 23.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/day_end_minute</key>
-      <applyto>/apps/evolution/calendar/display/day_end_minute</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-        <short>Workday end minute</short>
-        <long>Minute the workday ends on, 0 to 59.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/time_divisions</key>
-      <applyto>/apps/evolution/calendar/display/time_divisions</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>30</default>
-      <locale name="C">
-        <short>Time divisions</short>
-        <long>Intervals shown in Day and Work Week views, in minutes.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/hpane_position</key>
-      <applyto>/apps/evolution/calendar/display/hpane_position</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>400</default>
-      <locale name="C">
-        <short>Horizontal pane position</short>
-        <long>Position of the horizontal pane, between the date navigator calendar and the task list when not in the month view, in pixels.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/vpane_position</key>
-      <applyto>/apps/evolution/calendar/display/vpane_position</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>150</default>
-      <locale name="C">
-        <short>Vertical pane position</short>
-        <long>Position of the vertical pane, between the view and the date navigator calendar and task list when not in the month view, in pixels.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/month_hpane_position</key>
-      <applyto>/apps/evolution/calendar/display/month_hpane_position</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>32000</default>
-      <locale name="C">
-        <short>Month view horizontal pane position </short>
-        <long>Position of the horizontal pane, between the view and the date navigator calendar and task list in the month view, in pixels.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/month_vpane_position</key>
-      <applyto>/apps/evolution/calendar/display/month_vpane_position</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>150</default>
-      <locale name="C">
-        <short>Month view vertical pane position </short>
-        <long>Position of the vertical pane, between the view and the date navigator calendar and task list in the month view, in pixels.</long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/date_navigator_pane_position</key>
-      <applyto>/apps/evolution/calendar/display/date_navigator_pane_position</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>150</default>
-      <locale name="C">
-        <short>Month view vertical pane position </short>
-        <long>Position of the vertical pane, between the calendar lists and the date navigator calendar.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/memo_layout</key>
-      <applyto>/apps/evolution/calendar/display/memo_layout</applyto>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-        <short>Memo layout style</short>
-        <long>
-          The layout style determines where to place the preview pane
-          in relation to the memo list.  "0" (Classic View) places the
-          preview pane below the memo list.  "1" (Vertical View) places
-          the preview pane next to the memo list.
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/show_memo_preview</key>
-      <applyto>/apps/evolution/calendar/display/show_memo_preview</applyto>
-      <owner>evolution-calendar</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>Show the memo preview pane</short>
-         <long>
-           If "true", show the memo preview pane in the main window.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/memo_hpane_position</key>
-      <applyto>/apps/evolution/calendar/display/memo_hpane_position</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>200</default>
-      <locale name="C">
-        <short>Memo preview pane position (horizontal)</short>
-        <long>
-          Position of the task preview pane when oriented horizontally.
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/memo_vpane_position</key>
-      <applyto>/apps/evolution/calendar/display/memo_vpane_position</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>400</default>
-      <locale name="C">
-        <short>Memo preview pane position (vertical)</short>
-        <long>
-          Position of the memo preview pane when oriented vertically.
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/task_layout</key>
-      <applyto>/apps/evolution/calendar/display/task_layout</applyto>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-        <short>Task layout style</short>
-        <long>
-          The layout style determines where to place the preview pane
-          in relation to the task list.  "0" (Classic View) places the
-          preview pane below the task list.  "1" (Vertical View) places
-          the preview pane next to the task list.
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/show_task_preview</key>
-      <applyto>/apps/evolution/calendar/display/show_task_preview</applyto>
-      <owner>evolution-calendar</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>Show the task preview pane</short>
-         <long>
-           If "true", show the task preview pane in the main window.
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/task_hpane_position</key>
-      <applyto>/apps/evolution/calendar/display/task_hpane_position</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>200</default>
-      <locale name="C">
-        <short>Task preview pane position (horizontal)</short>
-        <long>
-          Position of the task preview pane when oriented horizontally.
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/task_vpane_position</key>
-      <applyto>/apps/evolution/calendar/display/task_vpane_position</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>400</default>
-      <locale name="C">
-        <short>Task preview pane position (vertical)</short>
-        <long>
-          Position of the task preview pane when oriented vertically.
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/compress_weekend</key>
-      <applyto>/apps/evolution/calendar/display/compress_weekend</applyto>
-      <owner>evolution-calendar</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Compress weekends in month view</short>
-        <long>Whether to compress weekends in the month view, which puts Saturday and Sunday in the space of one weekday.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/show_event_end</key>
-      <applyto>/apps/evolution/calendar/display/show_event_end</applyto>
-      <owner>evolution-calendar</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Show appointment end times in week and month views</short>
-        <long>Whether to display the end time of events in the week and month views.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/working_days</key>
-      <applyto>/apps/evolution/calendar/display/working_days</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>62</default>
-      <locale name="C">
-        <short>Work days</short>
-        <long>Days on which the start and end of work hours should be indicated.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/marcus_bains_line</key>
-      <applyto>/apps/evolution/calendar/display/marcus_bains_line</applyto>
-      <owner>evolution-calendar</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Marcus Bains Line</short>
-        <long>Whether to draw the Marcus Bains Line (line at current time) in the calendar.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/marcus_bains_color_dayview</key>
-      <applyto>/apps/evolution/calendar/display/marcus_bains_color_dayview</applyto>
-      <owner>evolution-calendar</owner>
-      <type>string</type>
-      <default>#ff0000</default>
-      <locale name="C">
-        <short>Marcus Bains Line Color - Day View</short>
-        <long>Color to draw the Marcus Bains line in the Day View.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/marcus_bains_color_timebar</key>
-      <applyto>/apps/evolution/calendar/display/marcus_bains_color_timebar</applyto>
-      <owner>evolution-calendar</owner>
-      <type>string</type>
-      <default>#ff0000</default>
-      <locale name="C">
-        <short>Marcus Bains Line Color - Time bar</short>
-        <long>Color to draw the Marcus Bains Line in the Time bar (empty for default).</long>
-      </locale>
-    </schema>
-
-     <schema>
-      <key>/schemas/apps/evolution/calendar/display/recur_events_italic</key>
-      <applyto>/apps/evolution/calendar/display/recur_events_italic</applyto>
-      <owner>evolution-calendar</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Recurrent Events in Italic</short>
-        <long>Show days with recurrent events in italic font in bottom left calendar.</long>
-      </locale>
-    </schema>
-
-    <!-- Memos -->
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/memos/primary_memos</key>
-      <applyto>/apps/evolution/calendar/memos/primary_memos</applyto>
-      <owner>evolution-calendar</owner>
-      <type>string</type>
-      <default></default>
-      <locale name="C">
-        <short>Primary memo list</short>
-        <long>
-          The UID of the selected (or "primary") memo list in the
-          sidebar of the "Memos" view.
-        </long>
-      </locale>
-    </schema>
-
-    <!-- Tasks -->
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/tasks/primary_tasks</key>
-      <applyto>/apps/evolution/calendar/tasks/primary_tasks</applyto>
-      <owner>evolution-calendar</owner>
-      <type>string</type>
-      <default></default>
-      <locale name="C">
-        <short>Primary task list</short>
-        <long>
-          The UID of the selected (or "primary") task list in the
-          sidebar of the "Tasks" view.
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/tasks/hide_completed</key>
-      <applyto>/apps/evolution/calendar/tasks/hide_completed</applyto>
-      <owner>evolution-calendar</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Hide completed tasks</short>
-        <long>Whether to hide completed tasks in the tasks view.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/tasks/hide_completed_units</key>
-      <applyto>/apps/evolution/calendar/tasks/hide_completed_units</applyto>
-      <owner>evolution-calendar</owner>
-      <type>string</type>
-      <default>days</default>
-      <locale name="C">
-        <short>Hide task units</short>
-        <long>Units for determining when to hide tasks, "minutes", "hours" or "days".</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/tasks/hide_completed_value</key>
-      <applyto>/apps/evolution/calendar/tasks/hide_completed_value</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>1</default>
-      <locale name="C">
-        <short>Hide task value</short>
-        <long>Number of units for determining when to hide tasks.</long>
-      </locale>
-    </schema>
-
-    <!-- Tasks: Colors -->
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/tasks/colors/due_today</key>
-      <applyto>/apps/evolution/calendar/tasks/colors/due_today</applyto>
-      <owner>evolution-calendar</owner>
-      <type>string</type>
-      <default>#1e90ff</default>
-      <locale name="C">
-        <short>Tasks due today color</short>
-	<long>Background color of tasks that are due today, in "#rrggbb" format.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/tasks/colors/overdue</key>
-      <applyto>/apps/evolution/calendar/tasks/colors/overdue</applyto>
-      <owner>evolution-calendar</owner>
-      <type>string</type>
-      <default>#ff0000</default>
-      <locale name="C">
-        <short>Overdue tasks color</short>
-	<long>Background color of tasks that are overdue, in "#rrggbb" format.</long>
-      </locale>
-    </schema>
-
-    <!-- Miscellaneous -->
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/prompts/confirm_delete</key>
-      <applyto>/apps/evolution/calendar/prompts/confirm_delete</applyto>
-      <owner>evolution-calendar</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Ask for confirmation when deleting items</short>
-        <long>Whether to ask for confirmation when deleting an appointment or task.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/prompts/confirm_purge</key>
-      <applyto>/apps/evolution/calendar/prompts/confirm_purge</applyto>
-      <owner>evolution-calendar</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Confirm expunge</short>
-        <long>Whether to ask for confirmation when expunging appointments and tasks.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/other/use_default_reminder</key>
-      <applyto>/apps/evolution/calendar/other/use_default_reminder</applyto>
-      <owner>evolution-calendar</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Default appointment reminder</short>
-        <long>Whether to set a default reminder for appointments.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/other/default_reminder_interval</key>
-      <applyto>/apps/evolution/calendar/other/default_reminder_interval</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>15</default>
-      <locale name="C">
-        <short>Default reminder value</short>
-        <long>Number of units for determining a default reminder.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/other/default_reminder_units</key>
-      <applyto>/apps/evolution/calendar/other/default_reminder_units</applyto>
-      <owner>evolution-calendar</owner>
-      <type>string</type>
-      <default>minutes</default>
-      <locale name="C">
-        <short>Default reminder units</short>
-        <long>Units for a default reminder, "minutes", "hours" or "days".</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/other/use_ba_reminder</key>
-      <applyto>/apps/evolution/calendar/other/use_ba_reminder</applyto>
-      <owner>evolution-calendar</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Birthday and anniversary reminder</short>
-        <long>
-          Whether to set a reminder for birthdays and anniversaries.
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/other/ba_reminder_interval</key>
-      <applyto>/apps/evolution/calendar/other/ba_reminder_interval</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>15</default>
-      <locale name="C">
-        <short>Birthday and anniversary reminder value</short>
-        <long>
-          Number of units for determining a birthday or anniversary reminder.
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/other/ba_reminder_units</key>
-      <applyto>/apps/evolution/calendar/other/ba_reminder_units</applyto>
-      <owner>evolution-calendar</owner>
-      <type>string</type>
-      <default>minutes</default>
-      <locale name="C">
-        <short>Birthday and anniversary reminder units</short>
-        <long>
-          Units for a birthday or anniversary reminder, "minutes", "hours"
-          or "days".
-        </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/show_week_numbers</key>
-      <applyto>/apps/evolution/calendar/display/show_week_numbers</applyto>
-      <owner>evolution-calendar</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Show week numbers in Day View, Work Week View, and Date Navigator</short>
-        <long>Whether to show week numbers in various places in the Calendar.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/month_scroll_by_week</key>
-      <applyto>/apps/evolution/calendar/display/month_scroll_by_week</applyto>
-      <owner>evolution-calendar</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Scroll Month View by a week</short>
-        <long>Whether to scroll a Month View by a week, not by a month.</long>
-      </locale>
-    </schema>
-
-    <!-- Alarm notification -->
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/notify/last_notification_time</key>
-      <applyto>/apps/evolution/calendar/notify/last_notification_time</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>-1</default>
-      <locale name="C">
-        <short>Last reminder time</short>
-        <long>Time the last reminder ran, in time_t.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/notify/calendars</key>
-      <applyto>/apps/evolution/calendar/notify/calendars</applyto>
-      <owner>evolution-calendar</owner>
-      <type>list</type>
-      <list_type>string</list_type>
-      <default>[]</default>
-      <locale name="C">
-        <short>Calendars to run reminders for</short>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/notify/programs</key>
-      <applyto>/apps/evolution/calendar/notify/programs</applyto>
-      <owner>evolution-calendar</owner>
-      <type>list</type>
-      <list_type>string</list_type>
-      <default>[]</default>
-      <locale name="C">
-        <short>Reminder programs</short>
-        <long>Programs that are allowed to be run by reminders.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/notify/notify_with_tray</key>
-      <applyto>/apps/evolution/calendar/notify/notify_with_tray</applyto>
-      <owner>evolution-calendar</owner>
-      <type>bool</type>
-      <default>false</default>
-      <locale name="C">
-        <short>Show display reminders in notification tray</short>
-        <long>Whether or not to use the notification tray for display reminders.</long>
-      </locale>
-    </schema>
-    
-    <schema>
-      <key>/schemas/apps/evolution/calendar/publish/uris</key>
-      <applyto>/apps/evolution/calendar/publish/uris</applyto>
-      <owner>evolution-calendar</owner>
-      <type>list</type>
-      <list_type>string</list_type>
-      <default>[]</default>
-      <locale name="C">
-        <short>Free/busy server URLs</short>
-        <long>List of server URLs for free/busy publishing.</long>
-      </locale>
-    </schema>    
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/publish/template</key>
-      <applyto>/apps/evolution/calendar/publish/template</applyto>
-      <owner>evolution-calendar</owner>
-      <type>string</type>
-      <default></default>
-      <locale name="C">
-        <short>Free/busy template URL</short>
-        <long>The URL template to use as a free/busy data fallback, %u is replaced by the user part of the mail address and %d is replaced by the domain.</long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/audio_dir</key>
-      <applyto>/apps/evolution/calendar/audio_dir</applyto>
-      <owner>evolution-calendar</owner>
-      <type>string</type>
-      <default></default>
-      <locale name="C">
-        <short>Save directory for reminder audio</short>
-         <long>
-           Directory for saving reminder audio files
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/error_timeout</key>
-      <applyto>/apps/evolution/calendar/display/error_timeout</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>60</default>
-      <locale name="C">
-          <short>Amount of time in seconds the error should be shown on the status bar.</short>
-          <long> Amount of time in seconds the error should be shown on the status bar.
-          </long>
-      </locale>
-    </schema>
-    <schema>
-      <key>/schemas/apps/evolution/calendar/display/error_level</key>
-      <applyto>/apps/evolution/calendar/display/error_level</applyto>
-      <owner>evolution-calendar</owner>
-      <type>int</type>
-      <default>0</default>
-      <locale name="C">
-         <short>Level beyond which the message should be logged.</short>
-         <long> This can have three possible values. 0 for errors. 1 for warnings.
-                2 for debug messages.
-         </long>
-      </locale>
-    </schema>
-  </schemalist>
-</gconfschemafile>
diff --git a/modules/calendar/e-cal-shell-settings.c b/modules/calendar/e-cal-shell-settings.c
index e160d18810..ade121d9c7 100644
--- a/modules/calendar/e-cal-shell-settings.c
+++ b/modules/calendar/e-cal-shell-settings.c
@@ -104,10 +104,10 @@ transform_icaltimezone_to_string (GBinding *binding,
 }
 
 static gboolean
-transform_weekdays_gconf_to_evolution (GBinding *binding,
-                                       const GValue *source_value,
-                                       GValue *target_value,
-                                       gpointer user_data)
+transform_weekdays_settings_to_evolution (GBinding *binding,
+					  const GValue *source_value,
+					  GValue *target_value,
+					  gpointer user_data)
 {
 	GDateWeekday weekday;
 
@@ -119,7 +119,7 @@ transform_weekdays_gconf_to_evolution (GBinding *binding,
 
 	/* This is purposefully verbose for better readability. */
 
-	/* GConf numbering */
+	/* setting numbering */
 	switch (g_value_get_int (source_value)) {
 		case 0:
 			weekday = G_DATE_SUNDAY;
@@ -177,10 +177,10 @@ transform_weekdays_gconf_to_evolution (GBinding *binding,
 }
 
 static gboolean
-transform_weekdays_evolution_to_gconf (GBinding *binding,
-                                       const GValue *source_value,
-                                       GValue *target_value,
-                                       gpointer user_data)
+transform_weekdays_evolution_to_settings (GBinding *binding,
+					  const GValue *source_value,
+					  GValue *target_value,
+					  gpointer user_data)
 {
 	GDateWeekday weekday;
 
@@ -192,7 +192,7 @@ transform_weekdays_evolution_to_gconf (GBinding *binding,
 
 	/* This is purposefully verbose for better readability. */
 
-	/* GConf numbering */
+	/* setting numbering */
 	switch (g_value_get_int (source_value)) {
 		case 0:
 			weekday = G_DATE_MONDAY;
@@ -692,7 +692,7 @@ e_cal_shell_backend_init_settings (EShell *shell)
 
 	/* Do not bind to this.  Use "cal-week-start-day" instead. */
 	e_shell_settings_install_property_for_key (
-		"cal-week-start-day-gconf",
+		"cal-week-start-day-setting",
 		CALENDAR_SCHEMA,
 		"week-start-day");
 
@@ -727,11 +727,8 @@ e_cal_shell_backend_init_settings (EShell *shell)
 		"prefer-new-item");
 
 	/* These properties use transform functions to convert
-	 * GConf values to forms more useful to Evolution.  We
-	 * have to use separate properties because GConfBridge
-	 * does not support transform functions.  Much of this
-	 * is backward-compatibility cruft for poorly designed
-	 * GConf schemas. */
+	 * GSettings values to forms more useful to Evolution.
+	 */
 
 	e_shell_settings_install_property (
 		g_param_spec_enum (
@@ -815,15 +812,15 @@ e_cal_shell_backend_init_settings (EShell *shell)
 			G_PARAM_READWRITE));
 
 	g_object_bind_property_full (
-		shell_settings, "cal-week-start-day-gconf",
+		shell_settings, "cal-week-start-day-setting",
 		shell_settings, "cal-week-start-day",
 		G_BINDING_BIDIRECTIONAL |
 		G_BINDING_SYNC_CREATE,
-		transform_weekdays_gconf_to_evolution,
-		transform_weekdays_evolution_to_gconf,
+		transform_weekdays_settings_to_evolution,
+		transform_weekdays_evolution_to_settings,
 		NULL, (GDestroyNotify) NULL);
 
-	/* XXX These are my favorite.  Storing a bit array in GConf
+	/* XXX These are my favorite.  Storing a bit array in GSettings
 	 *     instead of separate boolean keys.  Brilliant move. */
 
 	e_shell_settings_install_property (
diff --git a/modules/mail/e-mail-config-format-html.c b/modules/mail/e-mail-config-format-html.c
index a764e7d729..4b53d2dc28 100644
--- a/modules/mail/e-mail-config-format-html.c
+++ b/modules/mail/e-mail-config-format-html.c
@@ -32,28 +32,29 @@
 static gpointer parent_class;
 
 static void
-headers_changed_cb (GConfClient *client,
-                    guint cnxn_id,
-                    GConfEntry *entry,
+headers_changed_cb (GSettings *settings,
+                    const gchar *key,
                     gpointer user_data)
 {
-	GSList *header_config_list, *p;
+	gint ii;
+	gchar **headers;
 	EExtension *extension;
 	EMailFormatter *formatter;
 
-	g_return_if_fail (client != NULL);
+	g_return_if_fail (settings != NULL);
+
+	if (key && !g_str_equal (key, "headers"))
+		return;
 
 	extension = user_data;
 	formatter = E_MAIL_FORMATTER (e_extension_get_extensible (extension));
 
-	header_config_list = gconf_client_get_list (
-		client, "/apps/evolution/mail/display/headers",
-		GCONF_VALUE_STRING, NULL);
+	headers = g_settings_get_strv (settings, "headers");
 
 	e_mail_formatter_clear_headers (formatter);
-	for (p = header_config_list; p; p = g_slist_next (p)) {
+	for (ii = 0; headers && headers[ii]; ii++) {
 		EMailReaderHeader *h;
-		gchar *xml = (gchar *) p->data;
+		const gchar *xml = headers[ii];
 
 		h = e_mail_reader_header_from_xml (xml);
 		if (h && h->enabled)
@@ -64,26 +65,10 @@ headers_changed_cb (GConfClient *client,
 		e_mail_reader_header_free (h);
 	}
 
-	if (!header_config_list)
+	if (!headers || !headers[0])
 		e_mail_formatter_set_default_headers (formatter);
 
-	g_slist_foreach (header_config_list, (GFunc) g_free, NULL);
-	g_slist_free (header_config_list);
-}
-
-static void
-remove_header_notify_cb (gpointer data)
-{
-	GConfClient *client;
-	guint notify_id;
-
-	notify_id = GPOINTER_TO_INT (data);
-	g_return_if_fail (notify_id != 0);
-
-	client = gconf_client_get_default ();
-	gconf_client_notify_remove (client, notify_id);
-	gconf_client_remove_dir (client, "/apps/evolution/mail/display", NULL);
-	g_object_unref (client);
+	g_strfreev (headers);
 }
 
 static void
@@ -93,8 +78,7 @@ mail_config_format_html_constructed (GObject *object)
 	EExtensible *extensible;
 	EShellSettings *shell_settings;
 	EShell *shell;
-	GConfClient *client;
-	guint notify_id;
+	GSettings *settings;
 
 	extension = E_EXTENSION (object);
 	extensible = e_extension_get_extensible (extension);
@@ -140,21 +124,16 @@ mail_config_format_html_constructed (GObject *object)
 		G_BINDING_SYNC_CREATE);
 
 
-	client = gconf_client_get_default ();
-	gconf_client_add_dir (
-		client, "/apps/evolution/mail/display",
-		GCONF_CLIENT_PRELOAD_NONE, NULL);
-	notify_id = gconf_client_notify_add (
-		client, "/apps/evolution/mail/display/headers",
-		(GConfClientNotifyFunc) headers_changed_cb,
-		object, NULL, NULL);
+	settings = g_settings_new ("org.gnome.evolution.mail");
+	g_signal_connect (settings, "changed", G_CALLBACK (headers_changed_cb), object);
 
 	g_object_set_data_full (
-		G_OBJECT (extensible), "reader-header-notify-id",
-		GINT_TO_POINTER (notify_id), remove_header_notify_cb);
+		G_OBJECT (extensible), "reader-header-settings",
+		settings, g_object_unref);
+		
 
 	/* Initial synchronization */
-	headers_changed_cb (client, 0, NULL, object);
+	headers_changed_cb (settings, NULL, object);
 
 	/* Chain up to parent's constructed() method. */
 	G_OBJECT_CLASS (parent_class)->constructed (object);
diff --git a/modules/mail/e-mail-config-web-view.c b/modules/mail/e-mail-config-web-view.c
index 12e75dfbdf..2099511d62 100644
--- a/modules/mail/e-mail-config-web-view.c
+++ b/modules/mail/e-mail-config-web-view.c
@@ -79,7 +79,7 @@ mail_config_web_view_load_style (EMailConfigWebView *extension)
 
 	/* Some of our mail and composer preferences are passed down to
 	 * GtkHtml through style properties, unfortunately.  This builds
-	 * a style sheet for the EWebView using values from GConf. */
+	 * a style sheet for the EWebView using values from GSettings. */
 
 	custom_fonts = e_shell_settings_get_boolean (
 		extension->shell_settings, "mail-use-custom-fonts");
diff --git a/modules/mail/e-mail-shell-settings.c b/modules/mail/e-mail-shell-settings.c
index 8243f79e3a..3b0c6b59c6 100644
--- a/modules/mail/e-mail-shell-settings.c
+++ b/modules/mail/e-mail-shell-settings.c
@@ -25,8 +25,6 @@
 
 #include "e-mail-shell-settings.h"
 
-#include <gconf/gconf-client.h>
-
 #include <mail/e-mail-backend.h>
 
 #include <shell/e-shell.h>
@@ -368,13 +366,6 @@ e_mail_shell_settings_init (EShellBackend *shell_backend)
 		MAIL_SCHEMA,
 		"paned-view-headers-state");
 
-	/* These properties use transform functions to convert
-	 * GConf values to forms more useful to Evolution.  We
-	 * have to use separate properties because GConfBridge
-	 * does not support transform functions.  Much of this
-	 * is backward-compatibility cruft for poorly designed
-	 * GConf schemas. */
-
 	e_shell_settings_install_property (
 		g_param_spec_enum (
 			"mail-sidebar-ellipsize",
diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c
index 647e7892be..58700f26b1 100644
--- a/modules/mail/em-composer-prefs.c
+++ b/modules/mail/em-composer-prefs.c
@@ -208,7 +208,7 @@ spell_language_save (EMComposerPrefs *prefs)
 	}
 	spell_languages = g_list_reverse (spell_languages);
 
-	/* Update the GConf value. */
+	/* Update the GSettings value. */
 	e_save_spell_languages (spell_languages);
 
 	g_list_free (spell_languages);
diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c
index 9262ff8bb0..b2381b2cf2 100644
--- a/modules/mail/em-mailer-prefs.c
+++ b/modules/mail/em-mailer-prefs.c
@@ -100,7 +100,6 @@ em_mailer_prefs_finalize (GObject *object)
 	EMMailerPrefs *prefs = (EMMailerPrefs *) object;
 
 	g_object_unref (prefs->builder);
-	g_object_unref (prefs->gconf);
 	g_object_unref (prefs->settings);
 
 	/* Chain up to parent's finalize() method. */
@@ -120,9 +119,6 @@ static void
 em_mailer_prefs_init (EMMailerPrefs *preferences)
 {
 	preferences->settings = g_settings_new ("org.gnome.evolution.mail");
-
-	/* XXX Still need this for a little while longer. */
-	preferences->gconf = gconf_client_get_default ();
 }
 
 enum {
@@ -376,12 +372,12 @@ emmp_header_add_sensitivity (EMMailerPrefs *prefs)
 static void
 emmp_save_headers (EMMailerPrefs *prefs)
 {
-	GSList *header_list;
+	GPtrArray *headers;
 	GtkTreeIter iter;
 	gboolean valid;
 
 	/* Headers */
-	header_list = NULL;
+	headers = g_ptr_array_new_full (3, g_free);
 	valid = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (prefs->header_list_store), &iter);
 	while (valid) {
 		struct _EMailReaderHeader h;
@@ -397,16 +393,18 @@ emmp_save_headers (EMMailerPrefs *prefs)
 		h.enabled = enabled;
 
 		if ((xml = e_mail_reader_header_to_xml (&h)))
-			header_list = g_slist_append (header_list, xml);
+			g_ptr_array_add (headers, xml);
 
 		g_free (h.name);
 
 		valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (prefs->header_list_store), &iter);
 	}
 
-	gconf_client_set_list (prefs->gconf, "/apps/evolution/mail/display/headers", GCONF_VALUE_STRING, header_list, NULL);
-	g_slist_foreach (header_list, (GFunc) g_free, NULL);
-	g_slist_free (header_list);
+	g_ptr_array_add (headers, NULL);
+
+	g_settings_set_strv (prefs->settings, "headers", (const gchar * const *) headers->pdata);
+
+	g_ptr_array_free (headers, TRUE);
 }
 
 static void
@@ -706,7 +704,8 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs,
                            EMailSession *session,
                            EShell *shell)
 {
-	GSList *header_config_list, *header_add_list, *p;
+	GSList *header_add_list, *p;
+	gchar **headers_config;
 	EShellSettings *shell_settings;
 	GHashTable *default_header_hash;
 	GtkWidget *toplevel;
@@ -928,7 +927,7 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs,
 		G_BINDING_SYNC_CREATE);
 
 	/* headers */
-	locked = !gconf_client_key_is_writable (prefs->gconf, "/apps/evolution/mail/display/headers", NULL);
+	locked = !g_settings_is_writable (prefs->settings, "headers");
 
 	widget = e_builder_get_widget (prefs->builder, "photo_show");
 	g_object_bind_property (
@@ -999,7 +998,7 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs,
 						     NULL);
 
 	/* populated the listview with entries; firstly we add all the default headers, and then
-	 * we add read header configuration out of gconf. If a header in gconf is a default header,
+	 * we add read header configuration out of settings. If a header in settings is a default header,
 	 * we update the enabled flag accordingly
 	*/
 	header_add_list = NULL;
@@ -1015,31 +1014,30 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs,
 		header_add_list = g_slist_append (header_add_list, h);
 	}
 
-	/* read stored headers from gconf */
-	header_config_list = gconf_client_get_list (prefs->gconf, "/apps/evolution/mail/display/headers", GCONF_VALUE_STRING, NULL);
-	p = header_config_list;
-	while (p) {
-		EMailReaderHeader *h, *def;
-		gchar *xml = (gchar *) p->data;
-
-		h = e_mail_reader_header_from_xml (xml);
-		if (h) {
-			def = g_hash_table_lookup (default_header_hash, h->name);
-			if (def) {
-				def->enabled = h->enabled;
-				e_mail_reader_header_free (h);
-			} else {
-				h->is_default = FALSE;
-				header_add_list = g_slist_append (header_add_list, h);
+	/* read stored headers from settings */
+	headers_config = g_settings_get_strv (prefs->settings, "headers");
+	if (headers_config) {
+		for (i = 0; headers_config[i]; i++) {
+			EMailReaderHeader *h, *def;
+			const gchar *xml = headers_config[i];
+
+			h = e_mail_reader_header_from_xml (xml);
+			if (h) {
+				def = g_hash_table_lookup (default_header_hash, h->name);
+				if (def) {
+					def->enabled = h->enabled;
+					e_mail_reader_header_free (h);
+				} else {
+					h->is_default = FALSE;
+					header_add_list = g_slist_append (header_add_list, h);
+				}
 			}
 		}
 
-		p = p->next;
+		g_strfreev (headers_config);
 	}
 
 	g_hash_table_destroy (default_header_hash);
-	g_slist_foreach (header_config_list, (GFunc) g_free, NULL);
-	g_slist_free (header_config_list);
 
 	p = header_add_list;
 	while (p) {
diff --git a/modules/mail/em-mailer-prefs.h b/modules/mail/em-mailer-prefs.h
index d672d2cc9b..4466e166e8 100644
--- a/modules/mail/em-mailer-prefs.h
+++ b/modules/mail/em-mailer-prefs.h
@@ -24,7 +24,6 @@
 #define EM_MAILER_PREFS_H
 
 #include <gtk/gtk.h>
-#include <gconf/gconf-client.h>
 
 #include <shell/e-shell.h>
 #include <widgets/misc/e-preferences-window.h>
@@ -57,7 +56,6 @@ struct _EMMailerPrefs {
 	GtkVBox parent_object;
 
 	GtkBuilder *builder;
-	GConfClient *gconf;
 	GSettings *settings;
 
 	/* General tab */
diff --git a/modules/mailto-handler/Makefile.am b/modules/mailto-handler/Makefile.am
index f4349cf3fb..e33a120a47 100644
--- a/modules/mailto-handler/Makefile.am
+++ b/modules/mailto-handler/Makefile.am
@@ -21,38 +21,4 @@ module_mailto_handler_la_LIBADD = \
 module_mailto_handler_la_LDFLAGS = \
 	-module -avoid-version $(NO_UNDEFINED)
 
-schemadir = $(GCONF_SCHEMA_FILE_DIR)
-schema_in_files = apps-evolution-mail-prompts-checkdefault.schemas.in
-schema_DATA = $(schema_in_files:.schemas.in=.schemas)
-
-@INTLTOOL_SCHEMAS_RULE@
-
-if GCONF_SCHEMAS_INSTALL
-
-if OS_WIN32
-install-data-local:
-	if test -z "$(DESTDIR)" ; then							\
-		for p in $(schema_DATA) ; do						\
-			(echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE);	\
-			 echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat;	\
-			cmd /c _temp.bat; 						\
-			rm _temp.bat;							\
-		done									\
-	fi
-else
-install-data-local:
-	if test -z "$(DESTDIR)" ; then							\
-		for p in $(schema_DATA) ; do						\
-			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) 		\
-				$(GCONFTOOL) --makefile-install-rule $$p;		\
-		done									\
-	fi
-endif
-
-endif
-
-EXTRA_DIST = $(schema_in_files)
-
-DISTCLEANFILES = $(schema_DATA)
-
 -include $(top_srcdir)/git.mk
diff --git a/modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in b/modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in
deleted file mode 100644
index cdcaf7892a..0000000000
--- a/modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in
+++ /dev/null
@@ -1,16 +0,0 @@
-<gconfschemafile>
-  <schemalist>
-    <schema>
-      <key>/schemas/apps/evolution/mail/prompts/checkdefault</key>
-      <applyto>/apps/evolution/mail/prompts/checkdefault</applyto>
-      <owner>evolution-mail</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-        <short>Check whether Evolution is the default mailer</short>
-        <long>Every time Evolution starts, check whether or not it is the default mailer.</long>
-      </locale>
-    </schema>
-  </schemalist>
-</gconfschemafile>
-
diff --git a/modules/spamassassin/Makefile.am b/modules/spamassassin/Makefile.am
index cb8f5778fa..8475660319 100644
--- a/modules/spamassassin/Makefile.am
+++ b/modules/spamassassin/Makefile.am
@@ -22,38 +22,4 @@ module_spamassassin_la_LIBADD = \
 module_spamassassin_la_LDFLAGS = \
 	-module -avoid-version $(NO_UNDEFINED)
 
-schemadir = $(GCONF_SCHEMA_FILE_DIR)
-schema_in_files = evolution-spamassassin.schemas.in
-schema_DATA = $(schema_in_files:.schemas.in=.schemas)
-
-@INTLTOOL_SCHEMAS_RULE@
-
-if GCONF_SCHEMAS_INSTALL
-
-if OS_WIN32
-install-data-local:
-	if test -z "$(DESTDIR)" ; then							\
-		for p in $(schema_DATA) ; do						\
-			(echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE);	\
-			 echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat;	\
-			cmd /c _temp.bat; 						\
-			rm _temp.bat;							\
-		done									\
-	fi
-else
-install-data-local:
-	if test -z "$(DESTDIR)" ; then							\
-		for p in $(schema_DATA) ; do						\
-			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) 		\
-				$(GCONFTOOL) --makefile-install-rule $$p;		\
-		done									\
-	fi
-endif
-
-endif
-
-DISTCLEANFILES = $(schema_DATA)
-
-EXTRA_DIST = $(schema_in_files)
-
 -include $(top_srcdir)/git.mk
diff --git a/modules/spamassassin/evolution-spamassassin.c b/modules/spamassassin/evolution-spamassassin.c
index 7f595caf32..275e921398 100644
--- a/modules/spamassassin/evolution-spamassassin.c
+++ b/modules/spamassassin/evolution-spamassassin.c
@@ -1145,10 +1145,6 @@ e_spam_assassin_init (ESpamAssassin *extension)
 
 	extension->socket_path_mutex = g_mutex_new ();
 
-	/* XXX Once we move to GSettings these probably don't
-	 *     need to be properties anymore.  GConfBridge is
-	 *     just easier to deal with than GConfClient. */
-
 	settings = g_settings_new ("org.gnome.evolution.spamassassin");
 
 	g_settings_bind (
diff --git a/modules/spamassassin/evolution-spamassassin.schemas.in b/modules/spamassassin/evolution-spamassassin.schemas.in
deleted file mode 100644
index b344d1bffd..0000000000
--- a/modules/spamassassin/evolution-spamassassin.schemas.in
+++ /dev/null
@@ -1,33 +0,0 @@
-<gconfschemafile>
-  <schemalist>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/junk/sa/local_only</key>
-      <applyto>/apps/evolution/mail/junk/sa/local_only</applyto>
-      <owner>evolution-spamassassin</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>Use only local spam tests.</short>
-         <long>
-           Use only the local spam tests (no DNS).
-         </long>
-      </locale>
-    </schema>
-
-    <schema>
-      <key>/schemas/apps/evolution/mail/junk/sa/use_daemon</key>
-      <applyto>/apps/evolution/mail/junk/sa/use_daemon</applyto>
-      <owner>evolution-spamassassin</owner>
-      <type>bool</type>
-      <default>true</default>
-      <locale name="C">
-         <short>Use SpamAssassin daemon and client</short>
-         <long>
-            Use SpamAssassin daemon and client (spamc/spamd).
-         </long>
-      </locale>
-    </schema>
-
-  </schemalist>
-</gconfschemafile>