Move all plugin settings to their own schemas

11 files changed, 139 insertions, 83 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index 75a36d47e2..c7f73e4744 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -10,10 +10,18 @@ autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
 
 @INTLTOOL_DESKTOP_RULE@
 
-gsettings_SCHEMAS =					\
-	org.gnome.evolution.gschema.xml			\
-	org.gnome.evolution.addressbook.gschema.xml	\
-	org.gnome.evolution.mail.gschema.xml
+gsettings_SCHEMAS =							\
+	org.gnome.evolution.gschema.xml					\
+	org.gnome.evolution.addressbook.gschema.xml			\
+	org.gnome.evolution.calendar.gschema.xml			\
+	org.gnome.evolution.mail.gschema.xml				\
+	org.gnome.evolution.eplugin.attachment-reminder.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.mail-notification.gschema.xml	\
+	org.gnome.evolution.eplugin.templates.gschema.xml
 
 @INTLTOOL_XML_NOMERGE_RULE@
 
diff --git a/data/evolution.convert b/data/evolution.convert
index 0f8c7b46f4..57ce4d6a3c 100644
--- a/data/evolution.convert
+++ b/data/evolution.convert
@@ -31,13 +31,28 @@ hpane-position = /apps/evolution/addressbook/display/hpane_position
 vpane-position = /apps/evolution/addressbook/display/vpane_position
 show-preview = /apps/evolution/addressbook/display/show_preview
 
+[org.gnome.evolution.calendar]
+
 [org.gnome.evolution.mail]
 check-if-default-mailer = /apps/evolution/mail/prompts/checkdefault
-template-placeholders = /apps/evolution/mail/template_placeholders
+
+[org.gnome.evolution.eplugin.attachment-reminder]
 attachment-reminder-clues = /apps/evolution/mail/attachment_reminder_clues
-custom-headers = /apps/evolution/eplugin/email_custom_header/customHeader
+
+[org.gnome.evolution.eplugin.bogo-junk]
 utf8-for-spam-filter = /apps/evolution/mail/junk/bogofilter/unicode
+
+[org.gnome.evolution.eplugin.email-custom-header]
+custom-header = /apps/evolution/eplugin/email_custom_header/customHeader
+
+[org.gnome.evolution.eplugin.external-editor]
+external-editor-command = /apps/evolution/eplugin/external-editor/editor-command
+external-editor-launch-on-key-press = /apps/evolution/eplugin/external-editor/launch-on-key-press
+
+[org.gnome.evolution.eplugin.face-picture]
 insert-face-picture = /apps/evolution/eplugin/face/insert_by_default
+
+[org.gnome.evolution.eplugin.mail-notification]
 notify-only-inbox = /apps/evolution/eplugin/mail-notification/notify-only-inbox
 notify-dbus-enabled = /apps/evolution/eplugin/mail-notification/dbus-enabled
 notify-status-enabled = /apps/evolution/eplugin/mail-notification/status-enabled
@@ -46,5 +61,6 @@ notify-sound-enabled = /apps/evolution/eplugin/mail-notification/sound-enabled
 notify-sound-beep = /apps/evolution/eplugin/mail-notification/sound-beep
 notify-sound-file = /apps/evolution/eplugin/mail-notification/sound-file
 notify-sound-use-theme = /apps/evolution/eplugin/mail-notification/sound-use-theme
-external-editor-command = /apps/evolution/eplugin/external-editor/editor-command
-external-editor-launch-on-key-press = /apps/evolution/eplugin/external-editor/launch-on-key-press
+
+[org.gnome.evolution.eplugin.templates]
+template-placeholders = /apps/evolution/mail/template_placeholders
diff --git a/data/org.gnome.evolution.calendar.gschema.xml.in b/data/org.gnome.evolution.calendar.gschema.xml.in
new file mode 100644
index 0000000000..3cd7f77435
--- /dev/null
+++ b/data/org.gnome.evolution.calendar.gschema.xml.in
@@ -0,0 +1,4 @@
+<schemalist>
+  <schema gettext-domain="evolution" id="org.gnome.evolution.calendar" path="/apps/evolution/calendar/">
+  </schema>
+</schemalist>
diff --git a/data/org.gnome.evolution.eplugin.attachment-reminder.gschema.xml.in b/data/org.gnome.evolution.eplugin.attachment-reminder.gschema.xml.in
new file mode 100644
index 0000000000..7a4eb02e93
--- /dev/null
+++ b/data/org.gnome.evolution.eplugin.attachment-reminder.gschema.xml.in
@@ -0,0 +1,9 @@
+<schemalist>
+  <schema gettext-domain="evolution" id="org.gnome.evolution.eplugin.attachment-reminder" path="/apps/evolution/eplugin/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>
+      <_description>List of clues for the attachment reminder plugin to look for in a message body.</_description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/data/org.gnome.evolution.eplugin.bogo-junk.gschema.xml.in b/data/org.gnome.evolution.eplugin.bogo-junk.gschema.xml.in
new file mode 100644
index 0000000000..15db0a8956
--- /dev/null
+++ b/data/org.gnome.evolution.eplugin.bogo-junk.gschema.xml.in
@@ -0,0 +1,9 @@
+<schemalist>
+  <schema gettext-domain="evolution" id="org.gnome.evolution.eplugin.bogo-junk" path="/apps/evolution/eplugin/bogo-junk/">
+    <key name="utf8-for-spam-filter" type="b">
+      <default>true</default>
+      <_summary>Convert mail messages to Unicode</_summary>
+      <_description>Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from different character sets.</_description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/data/org.gnome.evolution.eplugin.email-custom-header.gschema.xml.in b/data/org.gnome.evolution.eplugin.email-custom-header.gschema.xml.in
new file mode 100644
index 0000000000..ac58441856
--- /dev/null
+++ b/data/org.gnome.evolution.eplugin.email-custom-header.gschema.xml.in
@@ -0,0 +1,9 @@
+<schemalist>
+  <schema gettext-domain="evolution" id="org.gnome.evolution.eplugin.email-custom-header" path="/apps/evolution/eplugin/email-custom-header/">
+    <key name="custom-header" type="as">
+      <default>['Security=Personal;Unclassified;Protected;InConfidence;Secret;Topsecret']</default>
+      <_summary>List of Custom Headers</_summary>
+      <_description>The key specifies the list of custom headers that you can add  to an outgoing message. The format for specifying a Header and Header value is: Name of the custom header followed by "=" and the values separated by ";"</_description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/data/org.gnome.evolution.eplugin.external-editor.gschema.xml.in b/data/org.gnome.evolution.eplugin.external-editor.gschema.xml.in
new file mode 100644
index 0000000000..993734349d
--- /dev/null
+++ b/data/org.gnome.evolution.eplugin.external-editor.gschema.xml.in
@@ -0,0 +1,14 @@
+<schemalist>
+  <schema gettext-domain="evolution" id="org.gnome.evolution.eplugin.external-editor" path="/apps/evolution/eplugin/external-editor/">
+    <key name="external-editor-command" type="s">
+      <default>'gedit'</default>
+      <_summary>Default External Editor</_summary>
+      <_description>The default command that must be used as the editor.</_description>
+    </key>
+    <key name="external-editor-launch-on-key-press" type="b">
+      <default>false</default>
+      <_summary>Automatically launch when a new mail is edited</_summary>
+      <_description>Automatically launch editor when key is pressed in the mail composer.</_description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/data/org.gnome.evolution.eplugin.face-picture.gschema.xml.in b/data/org.gnome.evolution.eplugin.face-picture.gschema.xml.in
new file mode 100644
index 0000000000..83e8630451
--- /dev/null
+++ b/data/org.gnome.evolution.eplugin.face-picture.gschema.xml.in
@@ -0,0 +1,9 @@
+<schemalist>
+  <schema gettext-domain="evolution" id="org.gnome.evolution.eplugin.face-picture" path="/apps/evolution/eplugin/face-picture/">
+    <key name="insert-face-picture" type="b">
+      <default>false</default>
+      <_summary>Insert Face picture by default</_summary>
+      <_description>Whether insert Face picture to outgoing messages by default. The picture should be set before checking this, otherwise nothing happens.</_description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/data/org.gnome.evolution.eplugin.mail-notification.gschema.xml.in b/data/org.gnome.evolution.eplugin.mail-notification.gschema.xml.in
new file mode 100644
index 0000000000..26dd1e2ae8
--- /dev/null
+++ b/data/org.gnome.evolution.eplugin.mail-notification.gschema.xml.in
@@ -0,0 +1,44 @@
+<schemalist>
+  <schema gettext-domain="evolution" id="org.gnome.evolution.eplugin.mail-notification" path="/apps/evolution/eplugin/mail-notification/">
+    <key name="notify-only-inbox" type="b">
+      <default>true</default>
+      <_summary>Notify new messages for Inbox only.</_summary>
+      <_description>Whether to notify new messages in Inbox folder only.</_description>
+    </key>
+    <key name="notify-dbus-enabled" type="b">
+      <default>true</default>
+      <_summary>Enable D-Bus messages.</_summary>
+      <_description>Generates a D-Bus message when new mail messages arrive.</_description>
+    </key>
+    <key name="notify-status-enabled" type="b">
+      <default>true</default>
+      <_summary>Enable icon in notification area.</_summary>
+      <_description>Show new mail icon in notification area when new messages arrive.</_description>
+    </key>
+    <key name="notify-status-notification" type="b">
+      <default>true</default>
+      <_summary>Popup message together with the icon.</_summary>
+      <_description>Whether show message over the icon when new messages arrive.</_description>
+    </key>
+    <key name="notify-sound-enabled" type="b">
+      <default>true</default>
+      <_summary>Play sound when new messages arrive.</_summary>
+      <_description>Whether play sound or beep when new messages arrive.</_description>
+    </key>
+    <key name="notify-sound-beep" type="b">
+      <default>true</default>
+      <_summary>Beep or play sound file.</_summary>
+      <_description>If "true", then beep, otherwise will play sound file when new messages arrive.</_description>
+    </key>
+    <key name="notify-sound-file" type="s">
+      <default>''</default>
+      <_summary>Sound file name to be played.</_summary>
+      <_description>Sound file to be played when new messages arrive, if not in beep mode.</_description>
+    </key>
+    <key name="notify-sound-use-theme" type="b">
+      <default>false</default>
+      <_summary>Use sound theme</_summary>
+      <_description>Play themed sound when new messages arrive, if not in beep mode.</_description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/data/org.gnome.evolution.eplugin.templates.gschema.xml.in b/data/org.gnome.evolution.eplugin.templates.gschema.xml.in
new file mode 100644
index 0000000000..7628c743b3
--- /dev/null
+++ b/data/org.gnome.evolution.eplugin.templates.gschema.xml.in
@@ -0,0 +1,9 @@
+<schemalist>
+  <schema gettext-domain="evolution" id="org.gnome.evolution.eplugin.templates" path="/apps/evolution/eplugin/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>
+      <_description>List of keyword/value pairs for the Templates plugin to substitute in a message body.</_description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/data/org.gnome.evolution.mail.gschema.xml.in b/data/org.gnome.evolution.mail.gschema.xml.in
index a7bc4dc0fa..df9d6c4d5c 100644
--- a/data/org.gnome.evolution.mail.gschema.xml.in
+++ b/data/org.gnome.evolution.mail.gschema.xml.in
@@ -5,80 +5,5 @@
       <_summary>Check whether Evolution is the default mailer</_summary>
       <_description>Every time Evolution starts, check whether or not it is the default mailer.</_description>
     </key>
-    <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>
-      <_description>List of keyword/value pairs for the Templates plugin to substitute in a message body.</_description>
-    </key>
-    <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>
-      <_description>List of clues for the attachment reminder plugin to look for in a message body.</_description>
-    </key>
-    <key name="custom-headers" type="as">
-      <default>['Security=Personal;Unclassified;Protected;InConfidence;Secret;Topsecret']</default>
-      <_summary>List of Custom Headers</_summary>
-      <_description>The key specifies the list of custom headers that you can add  to an outgoing message. The format for specifying a Header and Header value is: Name of the custom header followed by "=" and the values separated by ";"</_description>
-    </key>
-    <key name="utf8-for-spam-filter" type="b">
-      <default>true</default>
-      <_summary>Convert mail messages to Unicode</_summary>
-      <_description>Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from different character sets.</_description>
-    </key>
-    <key name="insert-face-picture" type="b">
-      <default>false</default>
-      <_summary>Insert Face picture by default</_summary>
-      <_description>Whether insert Face picture to outgoing messages by default. The picture should be set before checking this, otherwise nothing happens.</_description>
-    </key>
-    <key name="notify-only-inbox" type="b">
-      <default>true</default>
-      <_summary>Notify new messages for Inbox only.</_summary>
-      <_description>Whether to notify new messages in Inbox folder only.</_description>
-    </key>
-    <key name="notify-dbus-enabled" type="b">
-      <default>true</default>
-      <_summary>Enable D-Bus messages.</_summary>
-      <_description>Generates a D-Bus message when new mail messages arrive.</_description>
-    </key>
-    <key name="notify-status-enabled" type="b">
-      <default>true</default>
-      <_summary>Enable icon in notification area.</_summary>
-      <_description>Show new mail icon in notification area when new messages arrive.</_description>
-    </key>
-    <key name="notify-status-notification" type="b">
-      <default>true</default>
-      <_summary>Popup message together with the icon.</_summary>
-      <_description>Whether show message over the icon when new messages arrive.</_description>
-    </key>
-    <key name="notify-sound-enabled" type="b">
-      <default>true</default>
-      <_summary>Play sound when new messages arrive.</_summary>
-      <_description>Whether play sound or beep when new messages arrive.</_description>
-    </key>
-    <key name="notify-sound-beep" type="b">
-      <default>true</default>
-      <_summary>Beep or play sound file.</_summary>
-      <_description>If "true", then beep, otherwise will play sound file when new messages arrive.</_description>
-    </key>
-    <key name="notify-sound-file" type="s">
-      <default>''</default>
-      <_summary>Sound file name to be played.</_summary>
-      <_description>Sound file to be played when new messages arrive, if not in beep mode.</_description>
-    </key>
-    <key name="notify-sound-use-theme" type="b">
-      <default>false</default>
-      <_summary>Use sound theme</_summary>
-      <_description>Play themed sound when new messages arrive, if not in beep mode.</_description>
-    </key>
-    <key name="external-editor-command" type="s">
-      <default>'gedit'</default>
-      <_summary>Default External Editor</_summary>
-      <_description>The default command that must be used as the editor.</_description>
-    </key>
-    <key name="external-editor-launch-on-key-press" type="b">
-      <default>false</default>
-      <_summary>Automatically launch when a new mail is edited</_summary>
-      <_description>Automatically launch editor when key is pressed in the mail composer.</_description>
-    </key>
   </schema>
 </schemalist>