callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use EWebView functions whenever possible.

Browse Source
This commit is contained in:
Matthew Barnes
2010-05-30 23:03:41 -04:00
parent fb880ceb4f
commit 6640519e48
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mail/e-mail-reader-utils.c
View File

@ -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);

5
modules/mail/e-mail-shell-view-private.c
View File

@ -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)