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

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

commit 5e49c1fa4419c8f6eb3435e5f88d3742c3294dcf
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 |   10 ++++------
 modules/mail/evolution-module-mail.c  |    2 --
 4 files changed, 6 insertions(+), 10 deletions(-)
---
diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c
index bfa4d00..1f1da0b 100644
--- a/mail/e-mail-reader-utils.c
+++ b/mail/e-mail-reader-utils.c
@@ -1471,6 +1471,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);
@@ -1483,6 +1484,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 c769031..d7df670 100644
--- a/modules/mail/Makefile.am
+++ b/modules/mail/Makefile.am
@@ -23,8 +23,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 c44a1fd..89ce8f2 100644
--- a/modules/mail/e-mail-config-web-view.c
+++ b/modules/mail/e-mail-config-web-view.c
@@ -62,7 +62,7 @@ fix_color_string (gchar *color_string)
 }
 
 static void
-mail_config_web_view_constructed (GObject *object)
+mail_config_web_view_load_style (EMailConfigWebView *extension)
 {
 	GString *buffer;
 	gchar *citation_color;
@@ -144,21 +144,19 @@ mail_config_web_view_realize (GtkWidget *widget,
 
         shell_settings = extension->priv->shell_settings;
 
-	extensible = e_extension_get_extensible (E_EXTENSION (object));
-
 	g_object_bind_property (
 		shell_settings, "composer-inline-spelling",
-		extensible, "inline-spelling",
+		widget, "inline-spelling",
 		G_BINDING_SYNC_CREATE);
 
 	g_object_bind_property (
 		shell_settings, "composer-magic-links",
-		extensible, "magic-links",
+		widget, "magic-links",
 		G_BINDING_SYNC_CREATE);
 
 	g_object_bind_property (
 		shell_settings, "composer-magic-smileys",
-		extensible, "magic-smileys",
+		widget, "magic-smileys",
 		G_BINDING_SYNC_CREATE);
 
 	gtk_style_context_add_provider (
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);
 }