GNOME.org
 

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

commit b95f3c0dd649485f66114fc0f175a4eb5fe8bcda
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/Makefile.am              |    2 --
 mail/e-mail-reader-utils.c    |    5 +++--
 mail/em-format-html-display.c |   15 +++++++++++++--
 mail/em-format-html-print.c   |    2 +-
 mail/em-format-html.c         |   11 +++++++----
 mail/em-format-html.h         |   32 ++++++++++++++------------------
 widgets/misc/e-web-view.c     |    1 +
 8 files changed, 41 insertions(+), 31 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 944fd2c..6cce6e1 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])
@@ -253,7 +253,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/Makefile.am b/mail/Makefile.am
index 954ace7..ee660ed 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -95,7 +95,6 @@ mailinclude_HEADERS =					\
 	em-format-html.h				\
 	em-format-html-display.h			\
 	em-format-html-print.h				\
-	em-junk.h					\
 	em-search-context.h				\
 	em-subscription-editor.h			\
 	em-sync-stream.h				\
@@ -169,7 +168,6 @@ libevolution_mail_la_SOURCES =				\
 	em-format-html.c				\
 	em-format-html-display.c			\
 	em-format-html-print.c				\
-	em-junk.c					\
 	em-search-context.c				\
 	em-subscription-editor.c			\
 	em-sync-stream.c				\
diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c
index f54e18a..b13945c 100644
--- a/mail/e-mail-reader-utils.c
+++ b/mail/e-mail-reader-utils.c
@@ -796,6 +796,7 @@ mail_reader_get_message_ready_cb (CamelFolder *folder,
 	EMailBackend *backend;
 	EAlertSink *alert_sink;
 	EMFormatHTML *formatter;
+	EMailDisplay *display;
 	CamelMimeMessage *message;
 	GError *error = NULL;
 
@@ -823,8 +824,8 @@ 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));
-
-	formatter = e_mail_reader_get_formatter (context->reader);
+	display = e_mail_reader_get_mail_display (context->reader);
+	formatter = e_mail_display_get_formatter (display);
 
 	em_utils_reply_to_message (
 		shell, message,
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index 112424d..cb70403 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -552,8 +552,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)
@@ -715,6 +719,11 @@ efhd_class_init (EMFormatHTMLDisplayClass *class)
 static void
 efhd_init (EMFormatHTMLDisplay *efhd)
 {
+	EWebView *web_view;
+	GtkActionGroup *image_actions;
+	GtkUIManager *ui_manager;
+	GError *error = NULL;
+
 	efhd->priv = G_TYPE_INSTANCE_GET_PRIVATE (
 		efhd, EM_TYPE_FORMAT_HTML_DISPLAY, EMFormatHTMLDisplayPrivate);
 
@@ -725,21 +734,23 @@ efhd_init (EMFormatHTMLDisplay *efhd)
 		CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS |
 		CAMEL_MIME_FILTER_TOHTML_CONVERT_ADDRESSES;
 
+/* FIXME WEBKIT There's no way how to get web_view from EFHD for now...
 	image_actions = e_web_view_get_action_group (web_view, "image");
 	g_return_if_fail (image_actions != NULL);
 
 	gtk_action_group_add_actions (
 		image_actions, image_entries,
 		G_N_ELEMENTS (image_entries), 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...
 	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)
 		g_error ("%s", error->message);
-
+*/
 	g_signal_connect (
 		web_view, "update-actions",
 		G_CALLBACK (efhd_web_view_update_actions_cb), efhd);
diff --git a/mail/em-format-html-print.c b/mail/em-format-html-print.c
index 23cba45..c7eb1ea 100644
--- a/mail/em-format-html-print.c
+++ b/mail/em-format-html-print.c
@@ -85,7 +85,7 @@ efhp_init (GObject *o)
 	web_view = em_format_html_get_web_view (EM_FORMAT_HTML (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
 	efhp->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 	gtk_container_add (GTK_CONTAINER (efhp->window), GTK_WIDGET (web_view));
 	gtk_widget_realize (GTK_WIDGET (web_view));
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index 66b0258..bdd5d66 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -2404,10 +2404,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;
 
@@ -2455,9 +2455,12 @@ em_format_html_get_cached_image (EMFormatHTML *efh,
 	g_return_val_if_fail (efh != NULL, NULL);
 	g_return_val_if_fail (image_uri != NULL, NULL);
 
+	/* FIXME WEBKIT This has not been ported yet
 	if (!emfh_http_cache)
 		return NULL;
 
 	return camel_data_cache_get (
 		emfh_http_cache, EMFH_HTTP_CACHE_PATH, image_uri, NULL);
+	*/
+	return NULL;
 }
diff --git a/mail/em-format-html.h b/mail/em-format-html.h
index fc3f794..00de997 100644
--- a/mail/em-format-html.h
+++ b/mail/em-format-html.h
@@ -200,28 +200,24 @@ CamelMimePart *	em_format_html_file_part	(EMFormatHTML *efh,
 gchar *		em_format_html_format_cert_infos
 						(CamelCipherCertInfo *first_cinfo);
 
-CamelStream *	
-			em_format_html_get_cached_image	(EMFormatHTML *efh,
+CamelStream *
+		em_format_html_get_cached_image	(EMFormatHTML *efh,
 						 const gchar *image_uri);
 
-void		em_format_html_format_message (EMFormatHTML *efh,
-					      CamelStream *stream,
-					      GCancellable *cancellable);
-
-void		em_format_html_format_message_part (EMFormatHTML *efh,
-						  const gchar *part_id,
-    					  CamelStream *stream,
-						  GCancellable *cancellable);
-void		em_format_html_format_headers (EMFormatHTML *efh,
-					      CamelStream *stream,
-					      CamelMedium *part,
-					      GCancellable *cancellable);
+void		em_format_html_format_message	(EMFormatHTML *efh,
+						 CamelStream *stream,
+						 GCancellable *cancellable);
 
+void		em_format_html_format_message_part
+						(EMFormatHTML *efh,
+						 const gchar *part_id,
+    						 CamelStream *stream,
+						 GCancellable *cancellable);
 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);
 
 G_END_DECLS
 
diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c
index de20bdc..f62835c 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,
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]