diff options
| author | Dan Vrátil <dvratil@redhat.com> | 2012-03-29 00:39:26 +0800 |
|---|---|---|
| committer | Dan Vrátil <dvratil@redhat.com> | 2012-03-29 00:39:26 +0800 |
| commit | d97c776f24ce577dc4a24c9be2d3830faa7627e8 (patch) | |
| tree | 90754a31f50ef2703989cb3bba197b21038da845 /plugins/mail-to-task | |
| parent | a269411bacc7a7ce549db591204a868a7a8b2184 (diff) | |
| download | gsoc2013-evolution-d97c776f24ce577dc4a24c9be2d3830faa7627e8.tar gsoc2013-evolution-d97c776f24ce577dc4a24c9be2d3830faa7627e8.tar.gz gsoc2013-evolution-d97c776f24ce577dc4a24c9be2d3830faa7627e8.tar.bz2 gsoc2013-evolution-d97c776f24ce577dc4a24c9be2d3830faa7627e8.tar.lz gsoc2013-evolution-d97c776f24ce577dc4a24c9be2d3830faa7627e8.tar.xz gsoc2013-evolution-d97c776f24ce577dc4a24c9be2d3830faa7627e8.tar.zst gsoc2013-evolution-d97c776f24ce577dc4a24c9be2d3830faa7627e8.zip | |
WebKit port - port plugins
Diffstat (limited to 'plugins/mail-to-task')
| -rw-r--r-- | plugins/mail-to-task/Makefile.am | 6 | ||||
| -rw-r--r-- | plugins/mail-to-task/mail-to-task.c | 11 |
2 files changed, 6 insertions, 11 deletions
diff --git a/plugins/mail-to-task/Makefile.am b/plugins/mail-to-task/Makefile.am index 66f6ff5057..da78753556 100644 --- a/plugins/mail-to-task/Makefile.am +++ b/plugins/mail-to-task/Makefile.am @@ -9,8 +9,7 @@ liborg_gnome_mail_to_task_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ - $(GNOME_PLATFORM_CFLAGS) \ - $(GTKHTML_CFLAGS) + $(GNOME_PLATFORM_CFLAGS) liborg_gnome_mail_to_task_la_SOURCES = mail-to-task.c @@ -26,8 +25,7 @@ liborg_gnome_mail_to_task_la_LIBADD = \ $(top_builddir)/libemail-utils/libemail-utils.la \ $(top_builddir)/libemail-engine/libemail-engine.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ - $(GNOME_PLATFORM_LIBS) \ - $(GTKHTML_LIBS) + $(GNOME_PLATFORM_LIBS) EXTRA_DIST = org-gnome-mail-to-task.eplug.xml diff --git a/plugins/mail-to-task/mail-to-task.c b/plugins/mail-to-task/mail-to-task.c index 6cf942acb4..09ec15d6ef 100644 --- a/plugins/mail-to-task/mail-to-task.c +++ b/plugins/mail-to-task/mail-to-task.c @@ -32,7 +32,6 @@ #include <string.h> #include <glib/gi18n-lib.h> -#include <gtkhtml/gtkhtml.h> #include <libecal/e-cal-client.h> #include <libecal/e-cal-component.h> #include <libedataserver/e-account.h> @@ -1062,18 +1061,16 @@ text_contains_nonwhitespace (const gchar *text, static gchar * get_selected_text (EMailReader *reader) { - EMFormatHTML *formatter; - EWebView *web_view; + EMailDisplay *display; gchar *text = NULL; gint len; - formatter = e_mail_reader_get_formatter (reader); - web_view = em_format_html_get_web_view (formatter); + display = e_mail_reader_get_mail_display (reader); - if (!e_web_view_is_selection_active (web_view)) + if (!e_web_view_is_selection_active (E_WEB_VIEW (display))) return NULL; - text = gtk_html_get_selection_plain_text (GTK_HTML (web_view), &len); + text = e_mail_display_get_selection_plain_text (display, &len); if (text == NULL || !text_contains_nonwhitespace (text, len)) { g_free (text); |