diff options
Diffstat (limited to 'data')
-rw-r--r-- | data/Makefile.am | 21 | ||||
-rw-r--r-- | data/evolution.convert | 36 | ||||
-rw-r--r-- | data/org.gnome.evolution.bogofilter.gschema.xml.in (renamed from data/org.gnome.evolution.eplugin.bogo-junk.gschema.xml.in) | 2 | ||||
-rw-r--r-- | data/org.gnome.evolution.mail.gschema.xml.in | 25 | ||||
-rw-r--r-- | data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in (renamed from data/org.gnome.evolution.eplugin.attachment-reminder.gschema.xml.in) | 2 | ||||
-rw-r--r-- | data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in (renamed from data/org.gnome.evolution.eplugin.autocontacts.gschema.xml.in) | 2 | ||||
-rw-r--r-- | data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in (renamed from data/org.gnome.evolution.eplugin.email-custom-header.gschema.xml.in) | 2 | ||||
-rw-r--r-- | data/org.gnome.evolution.plugin.external-editor.gschema.xml.in (renamed from data/org.gnome.evolution.eplugin.external-editor.gschema.xml.in) | 2 | ||||
-rw-r--r-- | data/org.gnome.evolution.plugin.face-picture.gschema.xml.in (renamed from data/org.gnome.evolution.eplugin.face-picture.gschema.xml.in) | 2 | ||||
-rw-r--r-- | data/org.gnome.evolution.plugin.itip.gschema.xml.in (renamed from data/org.gnome.evolution.eplugin.itip.gschema.xml.in) | 2 | ||||
-rw-r--r-- | data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in (renamed from data/org.gnome.evolution.eplugin.mail-notification.gschema.xml.in) | 2 | ||||
-rw-r--r-- | data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in (renamed from data/org.gnome.evolution.eplugin.prefer-plain.gschema.xml.in) | 2 | ||||
-rw-r--r-- | data/org.gnome.evolution.plugin.templates.gschema.xml.in (renamed from data/org.gnome.evolution.eplugin.templates.gschema.xml.in) | 2 | ||||
-rw-r--r-- | data/org.gnome.evolution.spamassassin.gschema.xml.in | 29 |
14 files changed, 69 insertions, 62 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index c703876e48..334de53f80 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -17,16 +17,17 @@ gsettings_SCHEMAS = \ org.gnome.evolution.importer.gschema.xml \ org.gnome.evolution.mail.gschema.xml \ org.gnome.evolution.shell.gschema.xml \ - org.gnome.evolution.eplugin.attachment-reminder.gschema.xml \ - org.gnome.evolution.eplugin.autocontacts.gschema.xml \ - org.gnome.evolution.eplugin.bogo-junk.gschema.xml \ - org.gnome.evolution.eplugin.email-custom-header.gschema.xml \ - org.gnome.evolution.eplugin.external-editor.gschema.xml \ - org.gnome.evolution.eplugin.face-picture.gschema.xml \ - org.gnome.evolution.eplugin.itip.gschema.xml \ - org.gnome.evolution.eplugin.mail-notification.gschema.xml \ - org.gnome.evolution.eplugin.prefer-plain.gschema.xml \ - org.gnome.evolution.eplugin.templates.gschema.xml + org.gnome.evolution.bogofilter.gschema.xml \ + org.gnome.evolution.spamassassin.gschema.xml \ + org.gnome.evolution.plugin.attachment-reminder.gschema.xml \ + org.gnome.evolution.plugin.autocontacts.gschema.xml \ + org.gnome.evolution.plugin.email-custom-header.gschema.xml \ + org.gnome.evolution.plugin.external-editor.gschema.xml \ + org.gnome.evolution.plugin.face-picture.gschema.xml \ + org.gnome.evolution.plugin.itip.gschema.xml \ + org.gnome.evolution.plugin.mail-notification.gschema.xml \ + org.gnome.evolution.plugin.prefer-plain.gschema.xml \ + org.gnome.evolution.plugin.templates.gschema.xml @INTLTOOL_XML_NOMERGE_RULE@ 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 diff --git a/data/org.gnome.evolution.eplugin.bogo-junk.gschema.xml.in b/data/org.gnome.evolution.bogofilter.gschema.xml.in index 84ad60a66c..25ada49b56 100644 --- a/data/org.gnome.evolution.eplugin.bogo-junk.gschema.xml.in +++ b/data/org.gnome.evolution.bogofilter.gschema.xml.in @@ -1,5 +1,5 @@ <schemalist> - <schema gettext-domain="evolution" id="org.gnome.evolution.eplugin.bogo-junk" path="/org/gnome/evolution/eplugin/bogo-junk/"> + <schema gettext-domain="evolution" id="org.gnome.evolution.bogofilter" path="/org/gnome/evolution/bogofilter/"> <key name="utf8-for-spam-filter" type="b"> <default>true</default> <_summary>Convert mail messages to Unicode</_summary> diff --git a/data/org.gnome.evolution.mail.gschema.xml.in b/data/org.gnome.evolution.mail.gschema.xml.in index 830894ca6d..fdd1e14947 100644 --- a/data/org.gnome.evolution.mail.gschema.xml.in +++ b/data/org.gnome.evolution.mail.gschema.xml.in @@ -520,31 +520,6 @@ <_summary>The default plugin for Junk hook</_summary> <_description>This is the default junk plugin, even though there are multiple plugins enabled. If the default listed plugin is disabled, then it won't fall back to the other available plugins.</_description> </key> - <key name="junk-sa-local-only" type="b"> - <default>true</default> - <_summary>Use only local spam tests.</_summary> - <_description>Use only the local spam tests (no DNS).</_description> - </key> - <key name="junk-sa-socket-path" type="s"> - <default>''</default> - <_summary>Socket path for SpamAssassin</_summary> - <_description>Socket path for SpamAssassin</_description> - </key> - <key name="junk-sa-use-daemon" type="b"> - <default>true</default> - <_summary>Use SpamAssassin daemon and client</_summary> - <_description>Use SpamAssassin daemon and client (spamc/spamd).</_description> - </key> - <key name="junk-sa-spamc-binary" type="s"> - <default>'spamc'</default> - <_summary>SpamAssassin client binary</_summary> - <_description>SpamAssassin client binary</_description> - </key> - <key name="junk-sa-spamd-binary" type="s"> - <default>'spamd'</default> - <_summary>SpamAssassin daemon binary</_summary> - <_description>SpamAssassin daemon binary</_description> - </key> <key name="junk-lookup-addressbook" type="b"> <default>false</default> <_summary>Determines whether to lookup in address book for sender email</_summary> diff --git a/data/org.gnome.evolution.eplugin.attachment-reminder.gschema.xml.in b/data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in index 71fa2afaa7..51779d478d 100644 --- a/data/org.gnome.evolution.eplugin.attachment-reminder.gschema.xml.in +++ b/data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in @@ -1,5 +1,5 @@ <schemalist> - <schema gettext-domain="evolution" id="org.gnome.evolution.eplugin.attachment-reminder" path="/org/gnome/evolution/eplugin/attachment-reminder/"> + <schema gettext-domain="evolution" id="org.gnome.evolution.plugin.attachment-reminder" path="/org/gnome/evolution/plugin/attachment-reminder/"> <key name="attachment-reminder-clues" type="as"> <default>['attachment','attaching','attached','enclosed']</default> <_summary>List of clues for the attachment reminder plugin to look for in a message body</_summary> diff --git a/data/org.gnome.evolution.eplugin.autocontacts.gschema.xml.in b/data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in index f1ff4a12e2..7d9aefc9e9 100644 --- a/data/org.gnome.evolution.eplugin.autocontacts.gschema.xml.in +++ b/data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in @@ -1,5 +1,5 @@ <schemalist> - <schema gettext-domain="evolution" id="org.gnome.evolution.eplugin.autocontacts" path="/org/gnome/evolution/eplugin/autocontacts/"> + <schema gettext-domain="evolution" id="org.gnome.evolution.plugin.autocontacts" path="/org/gnome/evolution/plugin/autocontacts/"> <key name="addressbook-source" type="s"> <default>''</default> <_summary>Address book source</_summary> diff --git a/data/org.gnome.evolution.eplugin.email-custom-header.gschema.xml.in b/data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in index a82c18170d..87e526fdb1 100644 --- a/data/org.gnome.evolution.eplugin.email-custom-header.gschema.xml.in +++ b/data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in @@ -1,5 +1,5 @@ <schemalist> - <schema gettext-domain="evolution" id="org.gnome.evolution.eplugin.email-custom-header" path="/org/gnome/evolution/eplugin/email-custom-header/"> + <schema gettext-domain="evolution" id="org.gnome.evolution.plugin.email-custom-header" path="/org/gnome/evolution/plugin/email-custom-header/"> <key name="custom-header" type="as"> <default>['Security=Personal;Unclassified;Protected;InConfidence;Secret;Topsecret']</default> <_summary>List of Custom Headers</_summary> diff --git a/data/org.gnome.evolution.eplugin.external-editor.gschema.xml.in b/data/org.gnome.evolution.plugin.external-editor.gschema.xml.in index 5ee175adf0..f69cc1bc4f 100644 --- a/data/org.gnome.evolution.eplugin.external-editor.gschema.xml.in +++ b/data/org.gnome.evolution.plugin.external-editor.gschema.xml.in @@ -1,5 +1,5 @@ <schemalist> - <schema gettext-domain="evolution" id="org.gnome.evolution.eplugin.external-editor" path="/org/gnome/evolution/eplugin/external-editor/"> + <schema gettext-domain="evolution" id="org.gnome.evolution.plugin.external-editor" path="/org/gnome/evolution/plugin/external-editor/"> <key name="command" type="s"> <default>'gedit'</default> <_summary>Default External Editor</_summary> diff --git a/data/org.gnome.evolution.eplugin.face-picture.gschema.xml.in b/data/org.gnome.evolution.plugin.face-picture.gschema.xml.in index a5430b7fdd..b7c7682c52 100644 --- a/data/org.gnome.evolution.eplugin.face-picture.gschema.xml.in +++ b/data/org.gnome.evolution.plugin.face-picture.gschema.xml.in @@ -1,5 +1,5 @@ <schemalist> - <schema gettext-domain="evolution" id="org.gnome.evolution.eplugin.face-picture" path="/org/gnome/evolution/eplugin/face-picture/"> + <schema gettext-domain="evolution" id="org.gnome.evolution.plugin.face-picture" path="/org/gnome/evolution/plugin/face-picture/"> <key name="insert-face-picture" type="b"> <default>false</default> <_summary>Insert Face picture by default</_summary> diff --git a/data/org.gnome.evolution.eplugin.itip.gschema.xml.in b/data/org.gnome.evolution.plugin.itip.gschema.xml.in index 5e0e1d4567..af7513a5e3 100644 --- a/data/org.gnome.evolution.eplugin.itip.gschema.xml.in +++ b/data/org.gnome.evolution.plugin.itip.gschema.xml.in @@ -1,5 +1,5 @@ <schemalist> - <schema gettext-domain="evolution" id="org.gnome.evolution.eplugin.itip" path="/org/gnome/evolution/eplugin/itip/"> + <schema gettext-domain="evolution" id="org.gnome.evolution.plugin.itip" path="/org/gnome/evolution/plugin/itip/"> <key name="delete-processed" type="b"> <default>false</default> <_summary>Delete processed</_summary> diff --git a/data/org.gnome.evolution.eplugin.mail-notification.gschema.xml.in b/data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in index 025971f32e..c49d8b0e07 100644 --- a/data/org.gnome.evolution.eplugin.mail-notification.gschema.xml.in +++ b/data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in @@ -1,5 +1,5 @@ <schemalist> - <schema gettext-domain="evolution" id="org.gnome.evolution.eplugin.mail-notification" path="/org/gnome/evolution/eplugin/mail-notification/"> + <schema gettext-domain="evolution" id="org.gnome.evolution.plugin.mail-notification" path="/org/gnome/evolution/plugin/mail-notification/"> <key name="notify-only-inbox" type="b"> <default>true</default> <_summary>Notify new messages for Inbox only.</_summary> diff --git a/data/org.gnome.evolution.eplugin.prefer-plain.gschema.xml.in b/data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in index 6e9073da82..2cb7477a0d 100644 --- a/data/org.gnome.evolution.eplugin.prefer-plain.gschema.xml.in +++ b/data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in @@ -1,5 +1,5 @@ <schemalist> - <schema gettext-domain="evolution" id="org.gnome.evolution.eplugin.prefer-plain" path="/org/gnome/evolution/eplugin/prefer-plain/"> + <schema gettext-domain="evolution" id="org.gnome.evolution.plugin.prefer-plain" path="/org/gnome/evolution/plugin/prefer-plain/"> <key name="mode" type="s"> <default>'normal'</default> <_summary>Mode to use when displaying mails</_summary> diff --git a/data/org.gnome.evolution.eplugin.templates.gschema.xml.in b/data/org.gnome.evolution.plugin.templates.gschema.xml.in index 5fe07aab07..e0163ef8df 100644 --- a/data/org.gnome.evolution.eplugin.templates.gschema.xml.in +++ b/data/org.gnome.evolution.plugin.templates.gschema.xml.in @@ -1,5 +1,5 @@ <schemalist> - <schema gettext-domain="evolution" id="org.gnome.evolution.eplugin.templates" path="/org/gnome/evolution/eplugin/templates/"> + <schema gettext-domain="evolution" id="org.gnome.evolution.plugin.templates" path="/org/gnome/evolution/plugin/templates/"> <key name="template-placeholders" type="as"> <default>['myphone=012345','myplace=Abcd','myname=Alice']</default> <_summary>List of keyword/value pairs for the Templates plugin to substitute in a message body.</_summary> diff --git a/data/org.gnome.evolution.spamassassin.gschema.xml.in b/data/org.gnome.evolution.spamassassin.gschema.xml.in new file mode 100644 index 0000000000..7a95d07a35 --- /dev/null +++ b/data/org.gnome.evolution.spamassassin.gschema.xml.in @@ -0,0 +1,29 @@ +<schemalist> + <schema gettext-domain="evolution" id="org.gnome.evolution.spamassassin" path="/org/gnome/evolution/spamassassin/"> + <key name="local-only" type="b"> + <default>true</default> + <_summary>Use only local spam tests.</_summary> + <_description>Use only the local spam tests (no DNS).</_description> + </key> + <key name="socket-path" type="s"> + <default>''</default> + <_summary>Socket path for SpamAssassin</_summary> + <_description>Socket path for SpamAssassin</_description> + </key> + <key name="use-daemon" type="b"> + <default>true</default> + <_summary>Use SpamAssassin daemon and client</_summary> + <_description>Use SpamAssassin daemon and client (spamc/spamd).</_description> + </key> + <key name="spamc-binary" type="s"> + <default>'spamc'</default> + <_summary>SpamAssassin client binary</_summary> + <_description>SpamAssassin client binary</_description> + </key> + <key name="spamd-binary" type="s"> + <default>'spamd'</default> + <_summary>SpamAssassin daemon binary</_summary> + <_description>SpamAssassin daemon binary</_description> + </key> + </schema> +</schemalist> |