Migrate EShellSettings to GSettings

4 files changed, 198 insertions, 97 deletions

diff --git a/modules/addressbook/e-book-shell-settings.c b/modules/addressbook/e-book-shell-settings.c
index ae2e4f0adf..22e40a6485 100644
--- a/modules/addressbook/e-book-shell-settings.c
+++ b/modules/addressbook/e-book-shell-settings.c
@@ -25,18 +25,23 @@
 
 #include "e-book-shell-settings.h"
 
+#define ADDRESSBOOK_SCHEMA "org.gnome.evolution.addressbook"
+
 void
 e_book_shell_backend_init_settings (EShell *shell)
 {
 	e_shell_settings_install_property_for_key (
 		"book-completion-show-address",
-		"/apps/evolution/addressbook/completion/show_address");
+		ADDRESSBOOK_SCHEMA,
+		"completion-show-address");
 
 	e_shell_settings_install_property_for_key (
 		"book-primary-selection",
-		"/apps/evolution/addressbook/display/primary_addressbook");
+		ADDRESSBOOK_SCHEMA,
+		"primary-addressbook");
 
 	e_shell_settings_install_property_for_key (
 		"enable-address-formatting",
-		"/apps/evolution/addressbook/display/address_formatting");
+		ADDRESSBOOK_SCHEMA,
+		"address-formatting");
 }
diff --git a/modules/calendar/e-cal-shell-settings.c b/modules/calendar/e-cal-shell-settings.c
index 456f95707c..88b961e64f 100644
--- a/modules/calendar/e-cal-shell-settings.c
+++ b/modules/calendar/e-cal-shell-settings.c
@@ -25,12 +25,13 @@
 
 #include "e-cal-shell-settings.h"
 
-#include <gconf/gconf-client.h>
 #include <libecal/e-cal-util.h>
 
 #include <e-util/e-util.h>
 #include <e-util/e-util-enumtypes.h>
 
+#define CALENDAR_SCHEMA "org.gnome.evolution.calendar"
+
 static gboolean
 transform_string_to_icaltimezone (GBinding *binding,
                                   const GValue *source_value,
@@ -524,149 +525,184 @@ e_cal_shell_backend_init_settings (EShell *shell)
 
 	e_shell_settings_install_property_for_key (
 		"cal-ba-reminder-interval",
-		"/apps/evolution/calendar/other/ba_reminder_interval");
+		CALENDAR_SCHEMA,
+		"ba-reminder-interval");
 
 	e_shell_settings_install_property_for_key (
 		"cal-ba-reminder-units-string",
-		"/apps/evolution/calendar/other/ba_reminder_units");
+		CALENDAR_SCHEMA,
+		"ba-reminder-units");
 
 	e_shell_settings_install_property_for_key (
 		"cal-compress-weekend",
-		"/apps/evolution/calendar/display/compress_weekend");
+		CALENDAR_SCHEMA,
+		"compress-weekend");
 
 	e_shell_settings_install_property_for_key (
 		"cal-confirm-delete",
-		"/apps/evolution/calendar/prompts/confirm_delete");
+		CALENDAR_SCHEMA,
+		"confirm-delete");
 
 	e_shell_settings_install_property_for_key (
 		"cal-confirm-purge",
-		"/apps/evolution/calendar/prompts/confirm_purge");
+		CALENDAR_SCHEMA,
+		"confirm-purge");
 
 	e_shell_settings_install_property_for_key (
 		"cal-default-reminder-interval",
-		"/apps/evolution/calendar/other/default_reminder_interval");
+		CALENDAR_SCHEMA,
+		"default-reminder-interval");
 
 	/* Do not bind to this.
 	 * Use "cal-default-reminder-units" instead. */
 	e_shell_settings_install_property_for_key (
 		"cal-default-reminder-units-string",
-		"/apps/evolution/calendar/other/default_reminder_units");
+		CALENDAR_SCHEMA,
+		"default-reminder-units");
 
 	e_shell_settings_install_property_for_key (
 		"cal-free-busy-template",
-		"/apps/evolution/calendar/publish/template");
+		CALENDAR_SCHEMA,
+		"publish-template");
 
 	e_shell_settings_install_property_for_key (
 		"cal-hide-completed-tasks",
-		"/apps/evolution/calendar/tasks/hide_completed");
+		CALENDAR_SCHEMA,
+		"hide-completed-tasks");
 
 	/* Do not bind to this.
 	 * Use "cal-hide-completed-tasks-units" instead. */
 	e_shell_settings_install_property_for_key (
 		"cal-hide-completed-tasks-units-string",
-		"/apps/evolution/calendar/tasks/hide_completed_units");
+		CALENDAR_SCHEMA,
+		"hide-completed-tasks-units");
 
 	e_shell_settings_install_property_for_key (
 		"cal-hide-completed-tasks-value",
-		"/apps/evolution/calendar/tasks/hide_completed_value");
+		CALENDAR_SCHEMA,
+		"hide-completed-tasks-value");
 
 	e_shell_settings_install_property_for_key (
 		"cal-marcus-bains-day-view-color",
-		"/apps/evolution/calendar/display/marcus_bains_color_dayview");
+		CALENDAR_SCHEMA,
+		"marcus-bains-color-dayview");
 
 	e_shell_settings_install_property_for_key (
 		"cal-marcus-bains-time-bar-color",
-		"/apps/evolution/calendar/display/marcus_bains_color_timebar");
+		CALENDAR_SCHEMA,
+		"marcus-bains-color-timebar");
 
 	e_shell_settings_install_property_for_key (
 		"cal-marcus-bains-show-line",
-		"/apps/evolution/calendar/display/marcus_bains_line");
+		CALENDAR_SCHEMA,
+		"marcus-bains-line");
 
 	e_shell_settings_install_property_for_key (
 		"cal-month-scroll-by-week",
-		"/apps/evolution/calendar/display/month_scroll_by_week");
+		CALENDAR_SCHEMA,
+		"month-scroll-by-week");
 
 	e_shell_settings_install_property_for_key (
 		"cal-primary-calendar",
-		"/apps/evolution/calendar/display/primary_calendar");
+		CALENDAR_SCHEMA,
+		"primary-calendar");
 
 	e_shell_settings_install_property_for_key (
 		"cal-primary-memo-list",
-		"/apps/evolution/calendar/memos/primary_memos");
+		CALENDAR_SCHEMA,
+		"primary-memos");
 
 	e_shell_settings_install_property_for_key (
 		"cal-primary-task-list",
-		"/apps/evolution/calendar/tasks/primary_tasks");
+		CALENDAR_SCHEMA,
+		"primary-tasks");
 
 	e_shell_settings_install_property_for_key (
 		"cal-recur-events-italic",
-		"/apps/evolution/calendar/display/recur_events_italic");
+		CALENDAR_SCHEMA,
+		"recur-events-italic");
 
 	e_shell_settings_install_property_for_key (
 		"cal-show-event-end-times",
-		"/apps/evolution/calendar/display/show_event_end");
+		CALENDAR_SCHEMA,
+		"show-event-end");
 
 	e_shell_settings_install_property_for_key (
 		"cal-show-week-numbers",
-		"/apps/evolution/calendar/display/show_week_numbers");
+		CALENDAR_SCHEMA,
+		"show-week-numbers");
 
 	e_shell_settings_install_property_for_key (
 		"cal-tasks-color-due-today",
-		"/apps/evolution/calendar/tasks/colors/due_today");
+		CALENDAR_SCHEMA,
+		"task-due-today-color");
 
 	e_shell_settings_install_property_for_key (
 		"cal-tasks-color-overdue",
-		"/apps/evolution/calendar/tasks/colors/overdue");
+		CALENDAR_SCHEMA,
+		"task-overdue-color");
 
 	e_shell_settings_install_property_for_key (
 		"cal-time-divisions",
-		"/apps/evolution/calendar/display/time_divisions");
+		CALENDAR_SCHEMA,
+		"time-divisions");
 
 	/* Do not bind to this.  Use "cal-timezone" instead. */
 	e_shell_settings_install_property_for_key (
 		"cal-timezone-string",
-		"/apps/evolution/calendar/display/timezone");
+		CALENDAR_SCHEMA,
+		"timezone");
 
 	e_shell_settings_install_property_for_key (
 		"cal-use-24-hour-format",
-		"/apps/evolution/calendar/display/use_24hour_format");
+		CALENDAR_SCHEMA,
+		"use-24hour-format");
 
 	e_shell_settings_install_property_for_key (
 		"cal-use-ba-reminder",
-		"/apps/evolution/calendar/other/use_ba_reminder");
+		CALENDAR_SCHEMA,
+		"use-ba-reminder");
 
 	e_shell_settings_install_property_for_key (
 		"cal-use-default-reminder",
-		"/apps/evolution/calendar/other/use_default_reminder");
+		CALENDAR_SCHEMA,
+		"use-default-reminder");
 
 	e_shell_settings_install_property_for_key (
 		"cal-use-system-timezone",
-		"/apps/evolution/calendar/display/use_system_timezone");
+		CALENDAR_SCHEMA,
+		"use-system-timezone");
 
 	/* Do not bind to this.  Use "cal-week-start-day" instead. */
 	e_shell_settings_install_property_for_key (
 		"cal-week-start-day-gconf",
-		"/apps/evolution/calendar/display/week_start_day");
+		CALENDAR_SCHEMA,
+		"week-start-day");
 
 	e_shell_settings_install_property_for_key (
 		"cal-work-day-end-hour",
-		"/apps/evolution/calendar/display/day_end_hour");
+		CALENDAR_SCHEMA,
+		"day-end-hour");
 
 	e_shell_settings_install_property_for_key (
 		"cal-work-day-end-minute",
-		"/apps/evolution/calendar/display/day_end_minute");
+		CALENDAR_SCHEMA,
+		"day-end-minute");
 
 	e_shell_settings_install_property_for_key (
 		"cal-work-day-start-hour",
-		"/apps/evolution/calendar/display/day_start_hour");
+		CALENDAR_SCHEMA,
+		"day-start-hour");
 
 	e_shell_settings_install_property_for_key (
 		"cal-work-day-start-minute",
-		"/apps/evolution/calendar/display/day_start_minute");
+		CALENDAR_SCHEMA,
+		"day-start-minute");
 
 	e_shell_settings_install_property_for_key (
 		"cal-working-days-bitset",
-		"/apps/evolution/calendar/display/working_days");
+		CALENDAR_SCHEMA,
+		"working-days");
 
 	/* These properties use transform functions to convert
 	 * GConf values to forms more useful to Evolution.  We
diff --git a/modules/mail/e-mail-shell-settings.c b/modules/mail/e-mail-shell-settings.c
index b0d5f1eed8..5cc70efdbd 100644
--- a/modules/mail/e-mail-shell-settings.c
+++ b/modules/mail/e-mail-shell-settings.c
@@ -32,6 +32,8 @@
 
 #include <shell/e-shell.h>
 
+#define MAIL_SCHEMA "org.gnome.evolution.mail"
+
 static gboolean
 transform_no_folder_dots_to_ellipsize (GBinding *binding,
                                        const GValue *source_value,
@@ -95,239 +97,296 @@ e_mail_shell_settings_init (EShellBackend *shell_backend)
 
 	e_shell_settings_install_property_for_key (
 		"mail-address-compress",
-		"/apps/evolution/mail/display/address_compress");
+		MAIL_SCHEMA,
+		"address-compress");
 
 	e_shell_settings_install_property_for_key (
 		"mail-address-count",
-		"/apps/evolution/mail/display/address_count");
+		MAIL_SCHEMA,
+		"address-count");
 
 	e_shell_settings_install_property_for_key (
 		"mail-charset",
-		"/apps/evolution/mail/display/charset");
+		MAIL_SCHEMA,
+		"charset");
 
 	e_shell_settings_install_property_for_key (
 		"mail-check-for-junk",
-		"/apps/evolution/mail/junk/check_incoming");
+		MAIL_SCHEMA,
+		"junk-check-incoming");
 
 	e_shell_settings_install_property_for_key (
 		"mail-check-on-start",
-		"/apps/evolution/mail/send_recv_on_start");
+		MAIL_SCHEMA,
+		"send-recv-on-start");
 
 	e_shell_settings_install_property_for_key (
 		"mail-check-all-on-start",
-		"/apps/evolution/mail/send_recv_all_on_start");
+		MAIL_SCHEMA,
+		"send-recv-all-on-start");
 
 	e_shell_settings_install_property_for_key (
 		"mail-citation-color",
-		"/apps/evolution/mail/display/citation_colour");
+		MAIL_SCHEMA,
+		"citation-colour");
 
 	e_shell_settings_install_property_for_key (
 		"mail-confirm-expunge",
-		"/apps/evolution/mail/prompts/expunge");
+		MAIL_SCHEMA,
+		"prompt-on-expunge");
 
 	e_shell_settings_install_property_for_key (
 		"mail-confirm-unwanted-html",
-		"/apps/evolution/mail/prompts/unwanted_html");
+		MAIL_SCHEMA,
+		"prompt-on-unwanted-html");
 
 	e_shell_settings_install_property_for_key (
 		"mail-empty-junk-on-exit",
-		"/apps/evolution/mail/junk/empty_on_exit");
+		MAIL_SCHEMA,
+		"junk-empty-on-exit");
 
 	e_shell_settings_install_property_for_key (
 		"mail-empty-trash-on-exit",
-		"/apps/evolution/mail/trash/empty_on_exit");
+		MAIL_SCHEMA,
+		"trash-empty-on-exit");
 
 	e_shell_settings_install_property_for_key (
 		"mail-enable-search-folders",
-		"/apps/evolution/mail/display/enable_vfolders");
+		MAIL_SCHEMA,
+		"enable-vfolders");
 
 	e_shell_settings_install_property_for_key (
 		"mail-enable-local-folders",
-		"/apps/evolution/mail/display/enable_local");
+		MAIL_SCHEMA,
+		"enable-local");
 
 	e_shell_settings_install_property_for_key (
 		"mail-font-monospace",
-		"/apps/evolution/mail/display/fonts/monospace");
+		MAIL_SCHEMA,
+		"monospace-font");
 
 	e_shell_settings_install_property_for_key (
 		"mail-font-variable",
-		"/apps/evolution/mail/display/fonts/variable");
+		MAIL_SCHEMA,
+		"variable-width-font");
 
 	e_shell_settings_install_property_for_key (
 		"mail-force-message-limit",
-		"/apps/evolution/mail/display/force_message_limit");
+		MAIL_SCHEMA,
+		"force-message-limit");
 
 	/* This value corresponds to the EMailForwardStyle enum. */
 	e_shell_settings_install_property_for_key (
 		"mail-forward-style",
-		"/apps/evolution/mail/format/forward_style");
+		MAIL_SCHEMA,
+		"forward-style");
 
 	/* This value corresponds to MailConfigHTTPMode enum. */
 	e_shell_settings_install_property_for_key (
 		"mail-image-loading-policy",
-		"/apps/evolution/mail/display/load_http_images");
+		MAIL_SCHEMA,
+		"load-http-images");
 
 	e_shell_settings_install_property_for_key (
 		"mail-magic-spacebar",
-		"/apps/evolution/mail/display/magic_spacebar");
+		MAIL_SCHEMA,
+		"magic-spacebar");
 
 	e_shell_settings_install_property_for_key (
 		"mail-global-view-setting",
-		"/apps/evolution/mail/display/global_view_setting");
+		MAIL_SCHEMA,
+		"global-view-setting");
 
 	e_shell_settings_install_property_for_key (
 		"mail-mark-citations",
-		"/apps/evolution/mail/display/mark_citations");
+		MAIL_SCHEMA,
+		"mark-citations");
 
 	e_shell_settings_install_property_for_key (
 		"mail-mark-seen",
-		"/apps/evolution/mail/display/mark_seen");
+		MAIL_SCHEMA,
+		"mark-seen");
 
 	e_shell_settings_install_property_for_key (
 		"mail-mark-seen-timeout",
-		"/apps/evolution/mail/display/mark_seen_timeout");
+		MAIL_SCHEMA,
+		"mark-seen-timeout");
 
 	e_shell_settings_install_property_for_key (
 		"mail-message-text-part-limit",
-		"/apps/evolution/mail/display/message_text_part_limit");
+		MAIL_SCHEMA,
+		"message-text-part-limit");
 
 	/* Do not bind to this.  Use "mail-sidebar-ellipsize" instead. */
 	e_shell_settings_install_property_for_key (
 		"mail-no-folder-dots",
-		"/apps/evolution/mail/display/no_folder_dots");
+		MAIL_SCHEMA,
+		"no-folder-dots");
 
 	e_shell_settings_install_property_for_key (
 		"mail-only-local-photos",
-		"/apps/evolution/mail/display/photo_local");
+		MAIL_SCHEMA,
+		"photo-local");
 
 	e_shell_settings_install_property_for_key (
 		"mail-show-real-date",
-		"/apps/evolution/mail/display/show_real_date");
+		MAIL_SCHEMA,
+		"show-real-date");
 
 	e_shell_settings_install_property_for_key (
 		"mail-sort-accounts-alpha",
-		"/apps/evolution/mail/display/sort_accounts_alpha");
+		MAIL_SCHEMA,
+		"sort-accounts-alpha");
 
 	e_shell_settings_install_property_for_key (
 		"mail-prompt-delete-in-vfolder",
-		"/apps/evolution/mail/prompts/delete_in_vfolder");
+		MAIL_SCHEMA,
+		"prompt-on-delete-in-vfolder");
 
 	/* This value corresponds to the EMailReplyStyle enum,
 	 * but the ordering of the combo box items in preferences
 	 * has changed.  We use transformation functions there. */
 	e_shell_settings_install_property_for_key (
 		"mail-reply-style",
-		"/apps/evolution/mail/format/reply_style");
+		MAIL_SCHEMA,
+		"reply-style");
 
 	e_shell_settings_install_property_for_key (
 		"mail-safe-list",
-		"/apps/evolution/mail/display/safe_list");
+		MAIL_SCHEMA,
+		"safe-list");
 
 	e_shell_settings_install_property_for_key (
 		"mail-show-animated-images",
-		"/apps/evolution/mail/display/animated_images");
+		MAIL_SCHEMA,
+		"show-animated-images");
 
 	e_shell_settings_install_property_for_key (
 		"mail-show-sender-photo",
-		"/apps/evolution/mail/display/sender_photo");
+		MAIL_SCHEMA,
+		"show-sender-photo");
 
 	e_shell_settings_install_property_for_key (
 		"mail-sidebar-search",
-		"/apps/evolution/mail/display/side_bar_search");
+		MAIL_SCHEMA,
+		"side-bar-search");
 
 	e_shell_settings_install_property_for_key (
 		"mail-thread-by-subject",
-		"/apps/evolution/mail/display/thread_subject");
+		MAIL_SCHEMA,
+		"thread-subject");
 
 	e_shell_settings_install_property_for_key (
 		"mail-use-custom-fonts",
-		"/apps/evolution/mail/display/fonts/use_custom");
+		MAIL_SCHEMA,
+		"use-custom-font");
 
 	/*** Composer Preferences ***/
 
 	e_shell_settings_install_property_for_key (
 		"composer-charset",
-		"/apps/evolution/mail/composer/charset");
+		MAIL_SCHEMA,
+		"composer-charset");
 
 	e_shell_settings_install_property_for_key (
 		"composer-format-html",
-		"/apps/evolution/mail/composer/send_html");
+		MAIL_SCHEMA,
+		"composer-send-html");
 
 	e_shell_settings_install_property_for_key (
 		"composer-inline-spelling",
-		"/apps/evolution/mail/composer/inline_spelling");
+		MAIL_SCHEMA,
+		"composer-inline-spelling");
 
 	e_shell_settings_install_property_for_key (
 		"composer-magic-links",
-		"/apps/evolution/mail/composer/magic_links");
+		MAIL_SCHEMA,
+		"composer-magic-links");
 
 	e_shell_settings_install_property_for_key (
 		"composer-magic-smileys",
-		"/apps/evolution/mail/composer/magic_smileys");
+		MAIL_SCHEMA,
+		"composer-magic-smileys");
 
 	e_shell_settings_install_property_for_key (
 		"composer-outlook-filenames",
-		"/apps/evolution/mail/composer/outlook_filenames");
+		MAIL_SCHEMA,
+		"composer-outlook-filenames");
 
 	e_shell_settings_install_property_for_key (
 		"composer-ignore-list-reply-to",
-		"/apps/evolution/mail/composer/ignore_list_reply_to");
+		MAIL_SCHEMA,
+		"composer-ignore-list-reply-to");
 
 	e_shell_settings_install_property_for_key (
 		"composer-group-reply-to-list",
-		"/apps/evolution/mail/composer/group_reply_to_list");
+		MAIL_SCHEMA,
+		"composer-group-reply-to-list");
 
 	e_shell_settings_install_property_for_key (
 		"composer-prompt-only-bcc",
-		"/apps/evolution/mail/prompts/only_bcc");
+		MAIL_SCHEMA,
+		"prompt-on-only-bcc");
 
 	e_shell_settings_install_property_for_key (
 		"composer-prompt-private-list-reply",
-		"/apps/evolution/mail/prompts/private_list_reply");
+		MAIL_SCHEMA,
+		"prompt-on-private-list-reply");
 
 	e_shell_settings_install_property_for_key (
 		"composer-prompt-reply-many-recips",
-		"/apps/evolution/mail/prompts/reply_many_recips");
+		MAIL_SCHEMA,
+		"prompt-on-reply-many-recips");
 
 	e_shell_settings_install_property_for_key (
 		"composer-prompt-list-reply-to",
-		"/apps/evolution/mail/prompts/list_reply_to");
+		MAIL_SCHEMA,
+		"prompt-on-list-reply-to");
 
 	e_shell_settings_install_property_for_key (
 		"composer-prompt-empty-subject",
-		"/apps/evolution/mail/prompts/empty_subject");
+		MAIL_SCHEMA,
+		"prompt-on-empty-subject");
 
 	e_shell_settings_install_property_for_key (
 		"composer-prompt-send-invalid-recip",
-		"/apps/evolution/mail/prompts/send_invalid_recip");
+		MAIL_SCHEMA,
+		"prompt-on-invalid-recip");
 
 	e_shell_settings_install_property_for_key (
 		"composer-reply-start-bottom",
-		"/apps/evolution/mail/composer/reply_start_bottom");
+		MAIL_SCHEMA,
+		"composer-reply-start-bottom");
 
 	e_shell_settings_install_property_for_key (
 		"composer-request-receipt",
-		"/apps/evolution/mail/composer/request_receipt");
+		MAIL_SCHEMA,
+		"composer-request-receipt");
 
 	e_shell_settings_install_property_for_key (
 		"composer-spell-color",
-		"/apps/evolution/mail/composer/spell_color");
+		MAIL_SCHEMA,
+		"composer-spell-color");
 
 	e_shell_settings_install_property_for_key (
 		"composer-top-signature",
-		"/apps/evolution/mail/composer/top_signature");
+		MAIL_SCHEMA,
+		"composer-top-signature");
 
 	e_shell_settings_install_property_for_key (
 		"composer-no-signature-delim",
-		"/apps/evolution/mail/composer/no_signature_delim");
+		MAIL_SCHEMA,
+		"composer-no-signature-delim");
 
 	e_shell_settings_install_property_for_key (
 		"composer-gallery-path",
-		"/apps/evolution/mail/composer/gallery_path");
+		MAIL_SCHEMA,
+		"composer-gallery-path");
 
 	e_shell_settings_install_property_for_key (
 		"paned-view-headers-state",
-		"/apps/evolution/mail/display/paned_view_headers_state");
+		MAIL_SCHEMA,
+		"paned-view-headers-state");
 
 	/* These properties use transform functions to convert
 	 * GConf values to forms more useful to Evolution.  We
diff --git a/modules/mailto-handler/evolution-mailto-handler.c b/modules/mailto-handler/evolution-mailto-handler.c
index 4846aaaa85..98e03516ce 100644
--- a/modules/mailto-handler/evolution-mailto-handler.c
+++ b/modules/mailto-handler/evolution-mailto-handler.c
@@ -241,7 +241,8 @@ mailto_handler_constructed (GObject *object)
 
 	e_shell_settings_install_property_for_key (
 		"mailto-handler-check",
-		"/apps/evolution/mail/prompts/checkdefault");
+		"org.gnome.evolution.mail",
+		"prompt-check-if-default-mailer");
 
 	g_signal_connect_swapped (
 		shell, "event::ready-to-start",