diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2010-04-02 19:55:50 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2010-04-02 21:23:19 +0800 |
commit | 4e4fcdad46e710f18d3d802d9734fc53213bc6b8 (patch) | |
tree | 3b7c8fa6f8e0176e1bc8ba24f1b77be1c1805c68 /modules/mail | |
parent | a7cdda3232a8c0b0ed4d0ea279a67b9cf72cbb7c (diff) | |
download | gsoc2013-evolution-4e4fcdad46e710f18d3d802d9734fc53213bc6b8.tar gsoc2013-evolution-4e4fcdad46e710f18d3d802d9734fc53213bc6b8.tar.gz gsoc2013-evolution-4e4fcdad46e710f18d3d802d9734fc53213bc6b8.tar.bz2 gsoc2013-evolution-4e4fcdad46e710f18d3d802d9734fc53213bc6b8.tar.lz gsoc2013-evolution-4e4fcdad46e710f18d3d802d9734fc53213bc6b8.tar.xz gsoc2013-evolution-4e4fcdad46e710f18d3d802d9734fc53213bc6b8.tar.zst gsoc2013-evolution-4e4fcdad46e710f18d3d802d9734fc53213bc6b8.zip |
Miscellaneous cleanup bits from WebKit branch.
Diffstat (limited to 'modules/mail')
-rw-r--r-- | modules/mail/e-mail-shell-view-private.c | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/modules/mail/e-mail-shell-view-private.c b/modules/mail/e-mail-shell-view-private.c index 00dcb2ff1d..55765f34f6 100644 --- a/modules/mail/e-mail-shell-view-private.c +++ b/modules/mail/e-mail-shell-view-private.c @@ -257,19 +257,6 @@ mail_shell_view_reader_changed_cb (EMailShellView *mail_shell_view, } static void -mail_shell_view_reader_status_message_cb (EMailShellView *mail_shell_view, - const gchar *status_message) -{ - EShellView *shell_view; - EShellTaskbar *shell_taskbar; - - shell_view = E_SHELL_VIEW (mail_shell_view); - shell_taskbar = e_shell_view_get_shell_taskbar (shell_view); - - e_shell_taskbar_set_message (shell_taskbar, status_message); -} - -static void mail_shell_view_scroll_cb (EMailShellView *mail_shell_view, GtkOrientation orientation, GtkScrollType scroll_type, @@ -426,6 +413,7 @@ e_mail_shell_view_private_constructed (EMailShellView *mail_shell_view) EShellContent *shell_content; EShellSettings *shell_settings; EShellSidebar *shell_sidebar; + EShellTaskbar *shell_taskbar; EShellWindow *shell_window; EShellSearchbar *searchbar; EMFormatHTMLDisplay *html_display; @@ -447,6 +435,7 @@ e_mail_shell_view_private_constructed (EMailShellView *mail_shell_view) shell_backend = e_shell_view_get_shell_backend (shell_view); shell_content = e_shell_view_get_shell_content (shell_view); shell_sidebar = e_shell_view_get_shell_sidebar (shell_view); + shell_taskbar = e_shell_view_get_shell_taskbar (shell_view); shell_window = e_shell_view_get_shell_window (shell_view); ui_manager = e_shell_window_get_ui_manager (shell_window); @@ -573,8 +562,8 @@ e_mail_shell_view_private_constructed (EMailShellView *mail_shell_view) g_signal_connect_swapped ( web_view, "status-message", - G_CALLBACK (mail_shell_view_reader_status_message_cb), - mail_shell_view); + G_CALLBACK (e_shell_taskbar_set_message), + shell_taskbar); /* Need to keep the handler ID so we can disconnect it in * dispose(). The shell outlives us and we don't want it |