[evolution/wip/gsettings] Migrate face picture schemas to GSettings

[Rodrigo Moya <rodrigo src gnome org>]

commit 7b4aacd7323a0d65a692dfc3aa19e800cd619c0c
Author: Rodrigo Moya <rodrigo gnome-db org>
Date:   Wed Nov 3 18:27:49 2010 +0100

    Migrate face picture schemas to GSettings

 data/evolution.convert                       |    2 ++
 data/org.gnome.evolution.mail.gschema.xml.in |   10 ++++++++++
 2 files changed, 12 insertions(+), 0 deletions(-)
---
diff --git a/data/evolution.convert b/data/evolution.convert
index 930ac2d..84f5e91 100644
--- a/data/evolution.convert
+++ b/data/evolution.convert
@@ -36,3 +36,5 @@ check-if-default-mailer = /apps/evolution/mail/prompts/checkdefault
 template-placeholders = /apps/evolution/mail/template_placeholders
 attachment-reminder-clues = /apps/evolution/mail/attachment_reminder_clues
 custom-headers = /apps/evolution/eplugin/email_custom_header/customHeader
+utf8-for-spam-filter = /apps/evolution/mail/junk/bogofilter/unicode
+insert-face-picture = /apps/evolution/eplugin/face/insert_by_default
diff --git a/data/org.gnome.evolution.mail.gschema.xml.in b/data/org.gnome.evolution.mail.gschema.xml.in
index 0ac359e..e711d02 100644
--- a/data/org.gnome.evolution.mail.gschema.xml.in
+++ b/data/org.gnome.evolution.mail.gschema.xml.in
@@ -20,5 +20,15 @@
       <_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>
   </schema>
 </schemalist>