[evolution/webkit-composer: 87/130] Fix build after merge

[Matthew Barnes <mbarnes src gnome org>]

commit 5a619489904c184d1c27e53b7f3716e0064f77cc
Author: Dan VrÃtil <dvratil redhat com>
Date:   Tue Nov 27 17:59:54 2012 +0100

    Fix build after merge

 mail/e-mail-reader-utils.c            |    2 ++
 modules/mail/Makefile.am              |    2 --
 modules/mail/e-mail-config-web-view.c |   26 +++++++++++++-------------
 modules/mail/evolution-module-mail.c  |    2 --
 4 files changed, 15 insertions(+), 17 deletions(-)
---
diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c
index 1995fa8..5ecd8bf 100644
--- a/mail/e-mail-reader-utils.c
+++ b/mail/e-mail-reader-utils.c
@@ -1487,6 +1487,7 @@ e_mail_reader_reply_to_message (EMailReader *reader,
 		GtkToggleAction *action;
 
 		if ((validity_pgp_sum & E_MAIL_PART_VALIDITY_PGP) != 0) {
+                        EEditor *editor = E_EDITOR (composer);
 			if ((validity_pgp_sum & E_MAIL_PART_VALIDITY_SIGNED) != 0) {
 				action = GTK_TOGGLE_ACTION (E_COMPOSER_ACTION_PGP_SIGN (composer));
 				gtk_toggle_action_set_active (action, TRUE);
@@ -1499,6 +1500,7 @@ e_mail_reader_reply_to_message (EMailReader *reader,
 		}
 
 		if ((validity_smime_sum & E_MAIL_PART_VALIDITY_SMIME) != 0) {
+                        EEditor *editor = E_EDITOR (composer);
 			if ((validity_smime_sum & E_MAIL_PART_VALIDITY_SIGNED) != 0) {
 				action = GTK_TOGGLE_ACTION (E_COMPOSER_ACTION_SMIME_SIGN (composer));
 				gtk_toggle_action_set_active (action, TRUE);
diff --git a/modules/mail/Makefile.am b/modules/mail/Makefile.am
index ade1b53..c605814 100644
--- a/modules/mail/Makefile.am
+++ b/modules/mail/Makefile.am
@@ -22,8 +22,6 @@ module_mail_la_SOURCES = \
 	e-mail-config-reader.h						\
 	e-mail-config-web-view.c					\
 	e-mail-config-web-view.h					\
-	e-mail-config-web-view-gtkhtml.c				\
-	e-mail-config-web-view-gtkhtml.h				\
 	e-mail-event-hook.c						\
 	e-mail-event-hook.h						\
 	e-mail-shell-backend.c						\
diff --git a/modules/mail/e-mail-config-web-view.c b/modules/mail/e-mail-config-web-view.c
index e040291..1375524 100644
--- a/modules/mail/e-mail-config-web-view.c
+++ b/modules/mail/e-mail-config-web-view.c
@@ -33,7 +33,7 @@
 
 struct _EMailConfigWebViewPrivate {
 	GtkCssProvider *css_provider;
-	EShellSettings *shell_settings;
+        EShellSettings *shell_settings;
 };
 
 G_DEFINE_DYNAMIC_TYPE (
@@ -45,19 +45,19 @@ G_DEFINE_DYNAMIC_TYPE (
 static void
 fix_color_string (gchar *color_string)
 {
-	GdkColor color;
+        GdkColor color;
 
-	if (!color_string || strlen (color_string) < 13)
-		return;
+        if (!color_string || strlen (color_string) < 13)
+                return;
 
-	if (!gdk_color_parse (color_string, &color))
-		return;
+        if (!gdk_color_parse (color_string, &color))
+                return;
 
-	sprintf (
-		color_string, "#%02x%02x%02x",
-		(gint) color.red * 256 / 65536,
-		(gint) color.green * 256 / 65536,
-		(gint) color.blue * 256 / 65536);
+        sprintf (
+                color_string, "#%02x%02x%02x",
+                (gint) color.red * 256 / 65536,
+                (gint) color.green * 256 / 65536,
+                (gint) color.blue * 256 / 65536);
 }
 
 static void
@@ -250,7 +250,7 @@ mail_config_web_view_constructed (GObject *object)
 		extensible, "realize",
 		G_CALLBACK (mail_config_web_view_realize), extension);
 
-	/* Chain up to parent's consturcted() method. */
+	/* Chain up to parent's constructed() method. */
 	G_OBJECT_CLASS (e_mail_config_web_view_parent_class)->
 		constructed (object);
 }
@@ -264,8 +264,8 @@ e_mail_config_web_view_class_init (EMailConfigWebViewClass *class)
 	g_type_class_add_private (class, sizeof (EMailConfigWebViewPrivate));
 
 	object_class = G_OBJECT_CLASS (class);
-	object_class->dispose = mail_config_web_view_dispose;
 	object_class->constructed = mail_config_web_view_constructed;
+        object_class->dispose = mail_config_web_view_dispose;
 
 	extension_class = E_EXTENSION_CLASS (class);
 	extension_class->extensible_type = E_TYPE_WEB_VIEW;
diff --git a/modules/mail/evolution-module-mail.c b/modules/mail/evolution-module-mail.c
index fd2f5a3..c76e4ed 100644
--- a/modules/mail/evolution-module-mail.c
+++ b/modules/mail/evolution-module-mail.c
@@ -36,7 +36,6 @@
 #include "e-mail-config-format-html.h"
 #include "e-mail-config-reader.h"
 #include "e-mail-config-web-view.h"
-#include "e-mail-config-web-view-gtkhtml.h"
 
 #include "em-account-prefs.h"
 
@@ -63,7 +62,6 @@ e_module_load (GTypeModule *type_module)
 	e_mail_config_format_html_type_register (type_module);
 	e_mail_config_reader_type_register (type_module);
 	e_mail_config_web_view_type_register (type_module);
-	e_mail_config_web_view_gtkhtml_type_register (type_module);
 
 	em_account_prefs_type_register (type_module);
 }