[evolution/webkit-composer] Remove option to set spell-checking color

[Dan VrÃtil <dvratil src gnome org>]

commit b641ed034e7a4e5bc636fc7f6e7bb8800173c6bb
Author: Dan VrÃtil <dvratil redhat com>
Date:   Mon Nov 5 20:30:20 2012 +0100

    Remove option to set spell-checking color
    
    This was a special feature supported by GtkHTML, however
    WebKit does not seem to support it. It should use whatever
    is set as sytem default.

 data/org.gnome.evolution.mail.gschema.xml.in |    5 ---
 mail/mail-config.ui                          |   42 --------------------------
 modules/mail/e-mail-config-web-view.c        |   17 ----------
 modules/mail/e-mail-shell-settings.c         |    5 ---
 modules/mail/em-composer-prefs.c             |   10 ------
 5 files changed, 0 insertions(+), 79 deletions(-)
---
diff --git a/data/org.gnome.evolution.mail.gschema.xml.in b/data/org.gnome.evolution.mail.gschema.xml.in
index 0e83413..bb6725c 100644
--- a/data/org.gnome.evolution.mail.gschema.xml.in
+++ b/data/org.gnome.evolution.mail.gschema.xml.in
@@ -65,11 +65,6 @@
       <_summary>Send HTML mail by default</_summary>
       <_description>Send HTML mail by default.</_description>
     </key>
-    <key name="composer-spell-color" type="s">
-      <default>'#FFFF00000000'</default>
-      <_summary>Spell checking color</_summary>
-      <_description>Underline color for misspelled words when using inline spelling.</_description>
-    </key>
     <key name="composer-spell-languages" type="as">
       <default>[]</default>
       <_summary>Spell checking languages</_summary>
diff --git a/mail/mail-config.ui b/mail/mail-config.ui
index cef8453..95c00e3 100644
--- a/mail/mail-config.ui
+++ b/mail/mail-config.ui
@@ -786,48 +786,6 @@
                         <property name="position">0</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="GtkHBox" id="hboxSpellCheckColor">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="spacing">6</property>
-                        <child>
-                          <object class="GtkLabel" id="lblSpellCheckColor">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes">Color for _misspelled words:</property>
-                            <property name="use_underline">True</property>
-                            <property name="justify">center</property>
-                            <property name="mnemonic_widget">colorButtonSpellCheckColor</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkColorButton" id="colorButtonSpellCheckColor">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="use_action_appearance">False</property>
-                            <property name="title" translatable="yes">Pick a color</property>
-                            <property name="color">#000000000000</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
                   </object>
                 </child>
               </object>
diff --git a/modules/mail/e-mail-config-web-view.c b/modules/mail/e-mail-config-web-view.c
index aec9832..bbdb67b 100644
--- a/modules/mail/e-mail-config-web-view.c
+++ b/modules/mail/e-mail-config-web-view.c
@@ -67,7 +67,6 @@ mail_config_web_view_load_style (EMailConfigWebView *extension)
 	GString *buffer;
 	gchar *citation_color;
 	gchar *monospace_font;
-	gchar *spell_color;
 	gchar *variable_font;
 	gboolean custom_fonts;
 	gboolean mark_citations;
@@ -97,13 +96,9 @@ mail_config_web_view_load_style (EMailConfigWebView *extension)
 	citation_color = e_shell_settings_get_string (
 		shell_settings, "mail-citation-color");
 
-	spell_color = e_shell_settings_get_string (
-		shell_settings, "composer-spell-color");
-
 	buffer = g_string_new ("EWebView {\n");
 
 	fix_color_string (citation_color);
-	fix_color_string (spell_color);
 
 	if (custom_fonts && variable_font != NULL)
 		g_string_append_printf (
@@ -119,11 +114,6 @@ mail_config_web_view_load_style (EMailConfigWebView *extension)
 			buffer, "  -GtkHTML-cite-color: %s;\n",
 			citation_color);
 
-	if (spell_color != NULL)
-		g_string_append_printf (
-			buffer, "  -GtkHTML-spell-error-color: %s;\n",
-			spell_color);
-
 	g_string_append (buffer, "}\n");
 
 	gtk_css_provider_load_from_data (
@@ -140,7 +130,6 @@ mail_config_web_view_load_style (EMailConfigWebView *extension)
 	g_free (monospace_font);
 	g_free (variable_font);
 	g_free (citation_color);
-	g_free (spell_color);
 
 	extensible = e_extension_get_extensible (E_EXTENSION (extension));
 	style_context = gtk_widget_get_style_context (GTK_WIDGET (extensible));
@@ -211,12 +200,6 @@ mail_config_web_view_realize (GtkWidget *widget,
 		"notify::mail-citation-color",
 		G_CALLBACK (mail_config_web_view_load_style),
 		extension);
-
-	g_signal_connect_swapped (
-		shell_settings,
-		"notify::composer-spell-color",
-		G_CALLBACK (mail_config_web_view_load_style),
-		extension);
 }
 
 static void
diff --git a/modules/mail/e-mail-shell-settings.c b/modules/mail/e-mail-shell-settings.c
index 3b0c6b5..167afc9 100644
--- a/modules/mail/e-mail-shell-settings.c
+++ b/modules/mail/e-mail-shell-settings.c
@@ -342,11 +342,6 @@ e_mail_shell_settings_init (EShellBackend *shell_backend)
 		"composer-request-receipt");
 
 	e_shell_settings_install_property_for_key (
-		"composer-spell-color",
-		MAIL_SCHEMA,
-		"composer-spell-color");
-
-	e_shell_settings_install_property_for_key (
 		"composer-top-signature",
 		MAIL_SCHEMA,
 		"composer-top-signature");
diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c
index cde82d8..3463020 100644
--- a/modules/mail/em-composer-prefs.c
+++ b/modules/mail/em-composer-prefs.c
@@ -506,16 +506,6 @@ em_composer_prefs_construct (EMComposerPrefs *prefs,
 		GTK_IMAGE (info_pixmap),
 		GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_BUTTON);
 
-	widget = e_builder_get_widget (prefs->builder, "colorButtonSpellCheckColor");
-	g_object_bind_property_full (
-		shell_settings, "composer-spell-color",
-		widget, "color",
-		G_BINDING_BIDIRECTIONAL |
-		G_BINDING_SYNC_CREATE,
-		e_binding_transform_string_to_color,
-		e_binding_transform_color_to_string,
-		NULL, (GDestroyNotify) NULL);
-
 	spell_setup (prefs);
 
 	/* Forwards and Replies */