From 52ba74cef488e616e07b2ae8f5e93df8a9e31081 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sat, 5 Apr 2008 15:26:26 +0000
Subject: ** Fixes part of bug #526152, plus some tangential code cleanup.

2008-04-05  Matthew Barnes  <mbarnes@redhat.com>

	** Fixes part of bug #526152, plus some tangential code cleanup.

	* mail/Makefile.am:
	Remove all the IDL crud for GnomeSpell.

	* mail/em-composer-prefs.c:
	* mail/evolution-mail.schemas.in:
	* mail/mail-config.c:
	Define our own GConf keys for active spell checking languages
	and the underline color for misspelled words, instead of relying
	on GnomeSpell's GConf keys.  The new keys are:
	/apps/evolution/mail/composer/spell_color	(string)
	/apps/evolution/mail/composer/spell_languages	(list of strings)

	* mail/em-composer-prefs.c:
	* mail/em-composer-prefs.h:
	Cleanup the logic a bit to improve readability.

	* mail/mail-config.c:
	Cleanup the GConf notification logic:
	- We don't need the notification IDs for GConf keys we're watching.
	- Minimize the repetition of GConf keys to reduce the risk of typos.
	- Reduce the number of notification callback functions.

	* mail/Spell.idl:
	Remove this file; we don't use GnomeSpell anymore.

	* composer/e-msg-composer.c:
	* composer/e-composer-private.h:
	Initialize a new composer's spell checking language menu via
	our new "spell_languages" GConf key.

	* tools/killev.c (main):
	No need to continue killing the GnomeSpell Bonobo server.


svn path=/trunk/; revision=35322
---
 mail/evolution-mail.schemas.in | 48 +++++++++++++++++++++++++++++++++---------
 1 file changed, 38 insertions(+), 10 deletions(-)

(limited to 'mail/evolution-mail.schemas.in')

diff --git a/mail/evolution-mail.schemas.in b/mail/evolution-mail.schemas.in
index b5a3e579db..2e6785fe6c 100644
--- a/mail/evolution-mail.schemas.in
+++ b/mail/evolution-mail.schemas.in
@@ -18,15 +18,15 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/evolution/mail/composer/send_html</key>
-      <applyto>/apps/evolution/mail/composer/send_html</applyto>
+      <key>/schemas/apps/evolution/mail/composer/inline_spelling</key>
+      <applyto>/apps/evolution/mail/composer/inline_spelling</applyto>
       <owner>evolution-mail</owner>
       <type>bool</type>
-      <default>false</default>
+      <default>true</default>
       <locale name="C">
-         <short>Send HTML mail by default</short>
+         <short>Spell check inline</short>
          <long>
-          Send HTML mail by default.
+	 Draw spelling error indicators on words as you type.
          </long>
       </locale>
     </schema>
@@ -74,19 +74,47 @@
     </schema>
 
     <schema>
-      <key>/schemas/apps/evolution/mail/composer/inline_spelling</key>
-      <applyto>/apps/evolution/mail/composer/inline_spelling</applyto>
+      <key>/schemas/apps/evolution/mail/composer/send_html</key>
+      <applyto>/apps/evolution/mail/composer/send_html</applyto>
       <owner>evolution-mail</owner>
       <type>bool</type>
-      <default>true</default>
+      <default>false</default>
       <locale name="C">
-         <short>Spell check inline</short>
+         <short>Send HTML mail by default</short>
          <long>
-	 Draw spelling error indicators on words as you type.
+          Send HTML mail by default.
          </long>
       </locale>
     </schema>
 
+    <schema>
+      <key>/schemas/apps/evolution/mail/composer/spell_color</key>
+      <applyto>/apps/evolution/mail/composer/spell_color</applyto>
+      <owner>evolution-mail</owner>
+      <type>string</type>
+      <default>#FFFF00000000</default>
+      <locale name="C">
+        <short>Spell checking color</short>
+        <long>
+          Underline color for misspelled words when using inline spelling.
+        </long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schema/apps/evolution/mail/composer/spell_languages</key>
+      <applyto>/apps/evolution/mail/composer/spell_languages</applyto>
+      <owner>evolution-mail</owner>
+      <type>list</type>
+      <list_type>string</list_type>
+      <locale name="C">
+        <short>Spell checking languages</short>
+        <long>
+          List of dictionary language codes used for spell checking.
+        </long>
+      </locale>
+    </schema>
+
     <schema>
       <key>/schemas/apps/evolution/mail/composer/view/From</key>
       <applyto>/apps/evolution/mail/composer/view/From</applyto>
-- 
cgit