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

[Matthew Barnes <mbarnes src gnome org>]

commit 6be9a7eeefdb9a98145a0f0ae013e62bcecf66c0
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/settings/e-settings-web-view.c |   22 +++++++++++-----------
 2 files changed, 13 insertions(+), 11 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/settings/e-settings-web-view.c b/modules/settings/e-settings-web-view.c
index e2e1b3d..c388868 100644
--- a/modules/settings/e-settings-web-view.c
+++ b/modules/settings/e-settings-web-view.c
@@ -33,7 +33,7 @@
 
 struct _ESettingsWebViewPrivate {
 	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