aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-10-29 06:46:41 +0800
committerMatthew Barnes <mbarnes@redhat.com>2009-10-29 06:46:41 +0800
commit2b7aa4a797fc0545e9774a42fdbd6afae5271c6d (patch)
treee4e022c7b5a7f1a83f5a1b2e3870204b3e6d1a94 /mail
parent5a7992dca23eabdad214ae8f80f6050024d912d9 (diff)
downloadgsoc2013-evolution-2b7aa4a797fc0545e9774a42fdbd6afae5271c6d.tar
gsoc2013-evolution-2b7aa4a797fc0545e9774a42fdbd6afae5271c6d.tar.gz
gsoc2013-evolution-2b7aa4a797fc0545e9774a42fdbd6afae5271c6d.tar.bz2
gsoc2013-evolution-2b7aa4a797fc0545e9774a42fdbd6afae5271c6d.tar.lz
gsoc2013-evolution-2b7aa4a797fc0545e9774a42fdbd6afae5271c6d.tar.xz
gsoc2013-evolution-2b7aa4a797fc0545e9774a42fdbd6afae5271c6d.tar.zst
gsoc2013-evolution-2b7aa4a797fc0545e9774a42fdbd6afae5271c6d.zip
Bug 599896 - Flush outbox option is missing
This also reverts commit f5165c618ae2defb310a0ed4eab06dac7346a2b0.
Diffstat (limited to 'mail')
-rw-r--r--mail/em-utils.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/mail/em-utils.c b/mail/em-utils.c
index 2154c62e57..ec1b030f77 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -1415,21 +1415,22 @@ gboolean
em_utils_folder_is_outbox(CamelFolder *folder, const gchar *uri)
{
CamelFolder *local_outbox_folder;
- const gchar *local_outbox_uri;
+ const gchar *local_outbox_folder_uri;
local_outbox_folder =
e_mail_local_get_folder (E_MAIL_FOLDER_OUTBOX);
+ local_outbox_folder_uri =
+ e_mail_local_get_folder_uri (E_MAIL_FOLDER_OUTBOX);
- /* <Highlander>There can be only one.</Highlander> */
- if (folder && folder == local_outbox_folder)
+ if (folder == local_outbox_folder)
return TRUE;
- if (!uri || !local_outbox_folder)
+ if (uri == NULL)
return FALSE;
- local_outbox_uri = e_mail_local_get_folder_uri (E_MAIL_FOLDER_OUTBOX);
-
- return camel_store_folder_uri_equal (local_outbox_folder->parent_store, local_outbox_uri, uri);
+ return camel_store_folder_uri_equal (
+ local_outbox_folder->parent_store,
+ local_outbox_folder_uri, uri);
}
/**