From 0c1afa3941ef2663793d0b5e1fd9221423374d19 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 23 Sep 2009 18:22:10 -0400 Subject: Bug 594543 - Crash on folder/message change Based on a patch by Milan Crha. --- modules/mail/e-mail-shell-view-private.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/mail/e-mail-shell-view-private.c b/modules/mail/e-mail-shell-view-private.c index 1d25ac8e07..e6c5417b9a 100644 --- a/modules/mail/e-mail-shell-view-private.c +++ b/modules/mail/e-mail-shell-view-private.c @@ -207,11 +207,6 @@ static void mail_shell_view_reader_changed_cb (EMailShellView *mail_shell_view, EMailReader *reader) { - EMailShellContent *mail_shell_content; - - mail_shell_content = mail_shell_view->priv->mail_shell_content; - - e_mail_shell_content_update_view_instance (mail_shell_content); e_shell_view_update_actions (E_SHELL_VIEW (mail_shell_view)); e_mail_shell_view_update_sidebar (mail_shell_view); } @@ -434,6 +429,11 @@ e_mail_shell_view_private_constructed (EMailShellView *mail_shell_view) G_CALLBACK (mail_shell_view_reader_changed_cb), mail_shell_view); + g_signal_connect_swapped ( + reader, "folder-loaded", + G_CALLBACK (e_mail_shell_content_update_view_instance), + shell_content); + /* Use the same callback as "changed". */ g_signal_connect_swapped ( reader, "folder-loaded", -- cgit v1.2.3