From 8e546420df08f5fe243aa4227be44915fd79b86b Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 17 Jan 2009 23:46:45 +0000 Subject: Fix a runtime warning. svn path=/branches/kill-bonobo/; revision=37094 --- mail/e-mail-shell-view-private.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'mail/e-mail-shell-view-private.c') diff --git a/mail/e-mail-shell-view-private.c b/mail/e-mail-shell-view-private.c index c175e1ad4d..82a97352d9 100644 --- a/mail/e-mail-shell-view-private.c +++ b/mail/e-mail-shell-view-private.c @@ -31,12 +31,15 @@ mail_shell_view_folder_tree_selected_cb (EMailShellView *mail_shell_view, EMFolderTree *folder_tree) { EMailReader *reader; + gboolean folder_selected; reader = E_MAIL_READER (mail_shell_view->priv->mail_shell_content); - if ((flags & CAMEL_FOLDER_NOSELECT) || uri == NULL) - e_mail_reader_set_folder (reader, NULL, NULL); - else { + folder_selected = + !(flags & CAMEL_FOLDER_NOSELECT) && + full_name != NULL; + + if (folder_selected) { EMFolderTreeModel *model; model = em_folder_tree_get_model (folder_tree); @@ -44,7 +47,8 @@ mail_shell_view_folder_tree_selected_cb (EMailShellView *mail_shell_view, em_folder_tree_model_save_state (model); e_mail_reader_set_folder_uri (reader, uri); - } + } else + e_mail_reader_set_folder (reader, NULL, NULL); e_shell_view_update_actions (E_SHELL_VIEW (mail_shell_view)); } -- cgit v1.2.3