diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2009-09-07 07:23:57 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2009-09-09 02:53:45 +0800 |
| commit | fa9051e04051156a9e11e2af72a0d7342f4ea2e4 (patch) | |
| tree | 0d064bddb366257c660722359dc33f5ef3c610c7 /modules/mail | |
| parent | c9e7aa7aee6b407659843131cc8becdafa71992a (diff) | |
| download | gsoc2013-evolution-fa9051e04051156a9e11e2af72a0d7342f4ea2e4.tar.gz gsoc2013-evolution-fa9051e04051156a9e11e2af72a0d7342f4ea2e4.tar.zst gsoc2013-evolution-fa9051e04051156a9e11e2af72a0d7342f4ea2e4.zip | |
Finish killing Bonobo.
Diffstat (limited to 'modules/mail')
| -rw-r--r-- | modules/mail/e-mail-shell-content.c | 10 | ||||
| -rw-r--r-- | modules/mail/e-mail-shell-view-actions.c | 4 | ||||
| -rw-r--r-- | modules/mail/e-mail-shell-view-private.h | 1 |
3 files changed, 8 insertions, 7 deletions
diff --git a/modules/mail/e-mail-shell-content.c b/modules/mail/e-mail-shell-content.c index ac740fb6c5..60ddde7727 100644 --- a/modules/mail/e-mail-shell-content.c +++ b/modules/mail/e-mail-shell-content.c @@ -438,7 +438,7 @@ mail_shell_content_constructed (GObject *object) GConfBridge *bridge; GtkWidget *container; GtkWidget *widget; - GtkHTML *html; + EWebView *web_view; GalViewCollection *view_collection; const gchar *key; @@ -454,7 +454,7 @@ mail_shell_content_constructed (GObject *object) shell_backend = e_shell_view_get_shell_backend (shell_view); view_collection = shell_view_class->view_collection; - html = EM_FORMAT_HTML (priv->html_display)->html; + web_view = E_WEB_VIEW (EM_FORMAT_HTML (priv->html_display)->html); /* Build content widgets. */ @@ -492,12 +492,12 @@ mail_shell_content_constructed (GObject *object) GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_shadow_type ( GTK_SCROLLED_WINDOW (widget), GTK_SHADOW_IN); - gtk_container_add (GTK_CONTAINER (widget), GTK_WIDGET (html)); + gtk_container_add (GTK_CONTAINER (widget), GTK_WIDGET (web_view)); gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0); - gtk_widget_show (GTK_WIDGET (html)); + gtk_widget_show (GTK_WIDGET (web_view)); gtk_widget_show (widget); - widget = e_mail_search_bar_new (html); + widget = e_mail_search_bar_new (web_view); gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); priv->search_bar = g_object_ref (widget); gtk_widget_hide (widget); diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c index adb288d8fb..9c79164a35 100644 --- a/modules/mail/e-mail-shell-view-actions.c +++ b/modules/mail/e-mail-shell-view-actions.c @@ -681,7 +681,7 @@ action_mail_smart_backward_cb (GtkAction *action, html = EM_FORMAT_HTML (html_display)->html; - if (gtk_html_command (html, "scroll-backward")) + if (e_web_view_scroll_backward (E_WEB_VIEW (html))) return; if (caret_mode || !magic_spacebar) @@ -744,7 +744,7 @@ action_mail_smart_forward_cb (GtkAction *action, html = EM_FORMAT_HTML (html_display)->html; - if (gtk_html_command (html, "scroll-forward")) + if (e_web_view_scroll_forward (E_WEB_VIEW (html))) return; if (caret_mode || !magic_spacebar) diff --git a/modules/mail/e-mail-shell-view-private.h b/modules/mail/e-mail-shell-view-private.h index 30724b26b5..5c52e1251c 100644 --- a/modules/mail/e-mail-shell-view-private.h +++ b/modules/mail/e-mail-shell-view-private.h @@ -36,6 +36,7 @@ #include "e-util/gconf-bridge.h" #include "e-util/e-account-utils.h" #include "filter/filter-part.h" +#include "widgets/misc/e-web-view.h" #include "widgets/misc/e-popup-action.h" #include "widgets/menus/gal-view-instance.h" |