diff options
| -rw-r--r-- | mail/e-mail-reader-utils.c | 5 | ||||
| -rw-r--r-- | modules/mail/e-mail-shell-view-private.c | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c index 3282af34af..9d798d92c9 100644 --- a/mail/e-mail-reader-utils.c +++ b/mail/e-mail-reader-utils.c @@ -30,6 +30,7 @@ #include "e-util/e-alert-dialog.h" #include "filter/e-filter-rule.h" +#include "misc/e-web-view.h" #include "mail/e-mail-browser.h" #include "mail/em-composer-utils.h" @@ -358,6 +359,7 @@ e_mail_reader_reply_to_message (EMailReader *reader, CamelMimeMessage *new_message; CamelMimeMessage *src_message; CamelFolder *folder; + EWebView *web_view; GtkHTML *html; struct _camel_header_raw *header; const gchar *uid; @@ -372,6 +374,7 @@ e_mail_reader_reply_to_message (EMailReader *reader, html_display = e_mail_reader_get_html_display (reader); html = ((EMFormatHTML *) html_display)->html; + web_view = E_WEB_VIEW (html); folder = e_mail_reader_get_folder (reader); message_list = e_mail_reader_get_message_list (reader); @@ -379,7 +382,7 @@ e_mail_reader_reply_to_message (EMailReader *reader, uid = MESSAGE_LIST (message_list)->cursor_uid; g_return_if_fail (uid != NULL); - if (!gtk_html_command (html, "is-selection-active")) + if (!e_web_view_is_selection_active (web_view)) goto whole_message; selection = gtk_html_get_selection_html (html, &length); diff --git a/modules/mail/e-mail-shell-view-private.c b/modules/mail/e-mail-shell-view-private.c index 8a45c4b853..42394b2f53 100644 --- a/modules/mail/e-mail-shell-view-private.c +++ b/modules/mail/e-mail-shell-view-private.c @@ -268,10 +268,13 @@ mail_shell_view_scroll_cb (EMailShellView *mail_shell_view, EShellWindow *shell_window; EShellSettings *shell_settings; EMailReader *reader; + EWebView *web_view; GtkWidget *message_list; gboolean magic_spacebar; - if (html->binding_handled || gtk_html_get_caret_mode (html)) + web_view = E_WEB_VIEW (html); + + if (html->binding_handled || e_web_view_get_caret_mode (web_view)) return; if (orientation != GTK_ORIENTATION_VERTICAL) |