[evolution/webkit: 27/146] Fix minor issues caused by recent rebase against master.

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

commit 8a8d4798395178a5f86e08ec6b2845efc06082fb
Author: Dan VrÃtil <dvratil redhat com>
Date:   Wed Sep 21 17:34:24 2011 +0200

    Fix minor issues caused by recent rebase against master.

 configure.ac                  |    4 ++--
 mail/e-mail-display.c         |    6 +++---
 mail/e-mail-reader-utils.c    |    1 -
 mail/em-format-html-display.c |    9 +++++++--
 mail/em-format-html-print.c   |    2 +-
 mail/em-format-html.c         |    8 ++++----
 widgets/misc/e-web-view.c     |    1 +
 7 files changed, 18 insertions(+), 13 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 4ac55f8..1f465c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,7 @@ m4_define([gnome_desktop_minimum_version], [2.91.3])
 m4_define([gnome_icon_theme_minimum_version], [2.30.2.1])
 m4_define([gsettings_desktop_schemas_minimum_version], [2.91.92])
 m4_define([pangoft2_minimum_version], [1.0.1])		dnl For libgnomecanvas
-m4_define([webkit_minimum_version], [1.1.15])		dnl XXX Just a Guess
+m4_define([webkitgtk_minimum_version], [0.25])		dnl XXX Just a Guess
 m4_define([gconf_minimum_version], [2.0.0])		dnl XXX Just a Guess
 m4_define([libsoup_minimum_version], [2.4.0])		dnl XXX Just a Guess
 m4_define([libxml_minimum_version], [2.7.3])
@@ -252,7 +252,7 @@ PKG_CHECK_MODULES([GNOME_PLATFORM],
 	 shared-mime-info >= shared_mime_info_minimum_version
 	 gnome-desktop-3.0 >= gnome_desktop_minimum_version
 	 gsettings-desktop-schemas >= gsettings_desktop_schemas_minimum_version
-	 webkit-1.0 >= webkit_minimum_version])
+	 webkitgtk-3.0 >= webkitgtk_minimum_version])
 AC_SUBST(GNOME_PLATFORM_CFLAGS)
 AC_SUBST(GNOME_PLATFORM_LIBS)
 
diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c
index 0ec33bf..18cd6da 100644
--- a/mail/e-mail-display.c
+++ b/mail/e-mail-display.c
@@ -525,7 +525,7 @@ mail_display_class_init (EMailDisplayClass *class)
 }
 
 static void
-e_mail_display_init (EMailDisplay *display)
+mail_display_init (EMailDisplay *display)
 {
 	SoupSession *session;
 	SoupSessionFeature *feature;
@@ -562,12 +562,12 @@ e_mail_display_get_type (void)
 			sizeof (EMailDisplayClass),
 			(GBaseInitFunc) NULL,
 			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) e_mail_display_class_init,
+			(GClassInitFunc) mail_display_class_init,
 			(GClassFinalizeFunc) NULL,
 			NULL,  /* class_data */
 			sizeof (EMailDisplay),
 			0,     /* n_preallocs */
-			(GInstanceInitFunc) e_mail_display_init,
+			(GInstanceInitFunc) mail_display_init,
 			NULL   /* value_table */
 		};
 
diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c
index ce83048..fd3ad58 100644
--- a/mail/e-mail-reader-utils.c
+++ b/mail/e-mail-reader-utils.c
@@ -796,7 +796,6 @@ mail_reader_get_message_ready_cb (CamelFolder *folder,
 
 	backend = e_mail_reader_get_backend (context->reader);
 	shell = e_shell_backend_get_shell (E_SHELL_BACKEND (backend));
-
 	display = e_mail_reader_get_mail_display (context->reader);
 	formatter = e_mail_display_get_formatter (display);
 
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index d79a139..c78485d 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -554,8 +554,12 @@ action_image_save_cb (GtkAction *action,
 	EAttachment *attachment;
 	GFile *file;
 
+	/* FIXME WEBKIT At this moment there's no way how to get EMailDisplay from
+	   EMFormat(HTML)
 	web_view = em_format_html_get_web_view (EM_FORMAT_HTML (efhd));
 	g_return_if_fail (web_view != NULL);
+	*/
+	return;
 
 	image_src = e_web_view_get_cursor_image_src (web_view);
 	if (!image_src)
@@ -723,8 +727,9 @@ efhd_init (EMFormatHTMLDisplay *efhd)
 	GtkUIManager *ui_manager;
 	GError *error = NULL;
 
+
 	efhd->priv = EM_FORMAT_HTML_DISPLAY_GET_PRIVATE (efhd);
-	efhd->priv->attachment_views = g_hash_table_new_full (
+	efhd->priv->attachment_view = g_hash_table_new_full (
 		g_str_hash, g_str_equal, g_free, NULL);
 
 	/* we want to convert url's etc */
@@ -743,7 +748,7 @@ efhd_init (EMFormatHTMLDisplay *efhd)
 	/* Because we are loading from a hard-coded string, there is
 	 * no chance of I/O errors.  Failure here implies a malformed
 	 * UI definition.  Full stop. */
-/* FIXME WEBKIT There's no way how to get web_view from EFHD for now...
+/* FIXME WEBKIT There 's no way how to get web_view from EFHD for now...
 	ui_manager = e_web_view_get_ui_manager (web_view);
 	gtk_ui_manager_add_ui_from_string (ui_manager, image_ui, -1, &error);
 	if (error != NULL)
diff --git a/mail/em-format-html-print.c b/mail/em-format-html-print.c
index 72769c2..4323822 100644
--- a/mail/em-format-html-print.c
+++ b/mail/em-format-html-print.c
@@ -89,7 +89,7 @@ efhp_init (EMFormatHTMLPrint *efhp)
 	*/
 
 	/* gtk widgets don't like to be realized outside top level widget
-	 * so we put new html widget into gtk window */
+	 * so we put new html widget into gtk window
 	/* FIXME WEBKIT: this ain't gonna work
 	efhp->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 	gtk_container_add (GTK_CONTAINER (efhp->window), GTK_WIDGET (web_view));
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index cca583b..1f08a60 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -2410,10 +2410,10 @@ efh_format_full_headers (EMFormatHTML *efh,
 
 void
 em_format_html_format_headers (EMFormatHTML *efh,
-							   CamelStream *stream,
-							   CamelMedium *part,
-							   gboolean all_headers,
-							   GCancellable *cancellable)
+			       CamelStream *stream,
+			       CamelMedium *part,
+			       gboolean all_headers,
+			       GCancellable *cancellable)
 {
 	GString *buffer;
 
diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c
index 86e0bd2..4cf7294 100644
--- a/widgets/misc/e-web-view.c
+++ b/widgets/misc/e-web-view.c
@@ -79,6 +79,7 @@ enum {
 	PROP_0,
 	PROP_ANIMATE,
 	PROP_CARET_MODE,
+	PROP_COPY_TARGET_LIST,
 	PROP_CURSOR_IMAGE,
 	PROP_CURSOR_IMAGE_SRC,
 	PROP_DISABLE_PRINTING,