From 2e60b6a4a21105bb4a1e2badd1be51b3e684d165 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 22 Nov 2011 17:53:07 -0500 Subject: Tweak GSettings schemas. - Don't use the term "eplugin" for modules. - Use the term "plugin" instead of "eplugin" for plugins. - Split SpamAssassin settings into a separate schema. --- data/evolution.convert | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) (limited to 'data/evolution.convert') diff --git a/data/evolution.convert b/data/evolution.convert index 3d9179e5d1..46da5db91f 100644 --- a/data/evolution.convert +++ b/data/evolution.convert @@ -163,11 +163,6 @@ junk-empty-on-exit = /apps/evolution/mail/junk/empty_on_exit junk-empty-on-exit-days = /apps/evolution/mail/junk/empty_on_exit_days junk-lookup-addressbook = /apps/evolution/mail/junk/lookup_addressbook junk-lookup-addressbook-local-only = /apps/evolution/mail/junk/lookup_addressbook_local_only -junk-sa-local-only = /apps/evolution/mail/junk/sa/local_only -junk-sa-socket-path = "/apps/evolution/mail/junk/sa/socket_path -junk-sa-spamc-binary = /apps/evolution/mail/junk/sa/spamc_binary -junk-sa-spamd-binary = /apps/evolution/mail/junk/sa/spamd_binary -junk-sa-use-daemon = /apps/evolution/mail/junk/sa/use_daemon labels = /apps/evolution/mail/labels layout = /apps/evolution/mail/display/layout load-http-images = /apps/evolution/mail/display/load_http_images @@ -233,10 +228,20 @@ vfolder-editor-height = /apps/evolution/mail/vfolder_editor_height vfolder-editor-maximized = /apps/evolution/mail/vfolder_editor_maximized vfolder-editor-width = /apps/evolution/mail/vfolder_editor_width -[org.gnome.evolution.eplugin.attachment-reminder] +[org.gnome.evolution.bogofilter] +utf8-for-spam-filter = /apps/evolution/mail/junk/bogofilter/unicode + +[org.gnome.evolution.spamassassin] +local-only = /apps/evolution/mail/junk/sa/local_only +socket-path = "/apps/evolution/mail/junk/sa/socket_path +spamc-binary = /apps/evolution/mail/junk/sa/spamc_binary +spamd-binary = /apps/evolution/mail/junk/sa/spamd_binary +use-daemon = /apps/evolution/mail/junk/sa/use_daemon + +[org.gnome.evolution.plugin.attachment-reminder] attachment-reminder-clues = /apps/evolution/mail/attachment_reminder_clues -[org.gnome.evolution.eplugin.autocontacts] +[org.gnome.evolution.plugin.autocontacts] addressbook-source = /apps/evolution/autocontacts/addressbook_source auto-sync-gaim = /apps/evolution/autocontacts/auto_sync_gaim enable = /apps/evolution/autocontacts/enable_autocontacts @@ -245,23 +250,20 @@ gaim-check-interval = /apps/evolution/autocontacts/gaim_check_interval gaim-last-sync-md5 = /apps/evolution/autocontacts/gaim_last_sync_md5 gaim-last-sync-time = /apps/evolution/autocontacts/gaim_last_sync_time -[org.gnome.evolution.eplugin.bogo-junk] -utf8-for-spam-filter = /apps/evolution/mail/junk/bogofilter/unicode - -[org.gnome.evolution.eplugin.email-custom-header] +[org.gnome.evolution.plugin.email-custom-header] custom-header = /apps/evolution/eplugin/email_custom_header/customHeader -[org.gnome.evolution.eplugin.external-editor] +[org.gnome.evolution.plugin.external-editor] command = /apps/evolution/eplugin/external-editor/editor-command launch-on-key-press = /apps/evolution/eplugin/external-editor/launch-on-key-press -[org.gnome.evolution.eplugin.face-picture] +[org.gnome.evolution.plugin.face-picture] insert-face-picture = /apps/evolution/eplugin/face/insert_by_default -[org.gnome.evolution.eplugin.itip] +[org.gnome.evolution.plugin.itip] delete-processed = /apps/evolution/itip/delete_processed -[org.gnome.evolution.eplugin.mail-notification] +[org.gnome.evolution.plugin.mail-notification] notify-dbus-enabled = /apps/evolution/eplugin/mail-notification/dbus-enabled notify-only-inbox = /apps/evolution/eplugin/mail-notification/notify-only-inbox notify-sound-beep = /apps/evolution/eplugin/mail-notification/sound-beep @@ -272,9 +274,9 @@ notify-sound-use-theme = /apps/evolution/eplugin/mail-notification/sound-use-the notify-status-enabled = /apps/evolution/eplugin/mail-notification/status-enabled notify-status-notification = /apps/evolution/eplugin/mail-notification/status-notification -[org.gnome.evolution.eplugin.prefer-plain] +[org.gnome.evolution.plugin.prefer-plain] mode = /apps/evolution/eplugin/prefer_plain/mode" show-suppressed = /apps/evolution/eplugin/prefer_plain/show_suppressed -[org.gnome.evolution.eplugin.templates] +[org.gnome.evolution.plugin.templates] template-placeholders = /apps/evolution/mail/template_placeholders -- cgit v1.2.3