diff options
author | Milan Crha <mcrha@redhat.com> | 2012-05-31 00:46:49 +0800 |
---|---|---|
committer | Milan Crha <mcrha@redhat.com> | 2012-05-31 00:46:49 +0800 |
commit | c88d3170304e1892b221d0581a3cd3c767de4281 (patch) | |
tree | be7750049e7dca9b187bea5347556d2007ba5509 /mail/e-mail-reader.c | |
parent | b9d8defa321ea315ca15e59c9df33845563d5042 (diff) | |
download | gsoc2013-evolution-c88d3170304e1892b221d0581a3cd3c767de4281.tar.gz gsoc2013-evolution-c88d3170304e1892b221d0581a3cd3c767de4281.tar.zst gsoc2013-evolution-c88d3170304e1892b221d0581a3cd3c767de4281.zip |
Adapt to vFolder changes from evolution-data-server
Diffstat (limited to 'mail/e-mail-reader.c')
-rw-r--r-- | mail/e-mail-reader.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c index 2cc78f86b8..a5a66e3e87 100644 --- a/mail/e-mail-reader.c +++ b/mail/e-mail-reader.c @@ -3042,8 +3042,8 @@ mail_reader_set_folder (EMailReader *reader, shell = e_shell_backend_get_shell (E_SHELL_BACKEND (backend)); - /* Only synchronize the folder if we're online. */ - if (previous_folder != NULL && e_shell_get_online (shell)) + /* Only synchronize the real folder if we're online. */ + if (previous_folder != NULL && (CAMEL_IS_VEE_FOLDER (previous_folder) || e_shell_get_online (shell))) mail_sync_folder (previous_folder, NULL, NULL); /* Skip the rest if we're already viewing the folder. */ @@ -3059,6 +3059,11 @@ mail_reader_set_folder (EMailReader *reader, priv->folder_was_just_selected = (folder != NULL); + /* this is to make sure any post-poned changes in Search Folders + will be propagated on folder selection */ + if (folder && CAMEL_IS_VEE_FOLDER (folder)) + mail_sync_folder (folder, NULL, NULL); + message_list_set_folder ( MESSAGE_LIST (message_list), folder, outgoing); |