diff options
| author | Jeffrey Stedfast <fejj@ximian.com> | 2001-10-23 03:53:03 +0800 |
|---|---|---|
| committer | Jeffrey Stedfast <fejj@src.gnome.org> | 2001-10-23 03:53:03 +0800 |
| commit | 746bfdb6c34da2c53de84e0b8780c39920375ad2 (patch) | |
| tree | 06fcd9eabe06ef9e8203029477b45c022cf7a815 /mail/mail-callbacks.c | |
| parent | bce08f29c3bfe5f60befb6d68f88f3a165a66ed5 (diff) | |
| download | gsoc2013-evolution-746bfdb6c34da2c53de84e0b8780c39920375ad2.tar gsoc2013-evolution-746bfdb6c34da2c53de84e0b8780c39920375ad2.tar.gz gsoc2013-evolution-746bfdb6c34da2c53de84e0b8780c39920375ad2.tar.bz2 gsoc2013-evolution-746bfdb6c34da2c53de84e0b8780c39920375ad2.tar.lz gsoc2013-evolution-746bfdb6c34da2c53de84e0b8780c39920375ad2.tar.xz gsoc2013-evolution-746bfdb6c34da2c53de84e0b8780c39920375ad2.tar.zst gsoc2013-evolution-746bfdb6c34da2c53de84e0b8780c39920375ad2.zip | |
Don't wrap error text with <blockquote>, this is done inside
2001-10-22 Jeffrey Stedfast <fejj@ximian.com>
* mail-format.c (format_mime_part): Don't wrap error text with
<blockquote>, this is done inside mail_error_write.
(handle_multipart_encrypted): If we get an exception trying to
decrypt the mime part, display an error rather than trying to
treat it as multipart/mixed.
* mail-callbacks.c (empty_trash): Confirm expunge.
svn path=/trunk/; revision=13893
Diffstat (limited to 'mail/mail-callbacks.c')
| -rw-r--r-- | mail/mail-callbacks.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c index 5000bfe6ea..2b7176aef3 100644 --- a/mail/mail-callbacks.c +++ b/mail/mail-callbacks.c @@ -2387,13 +2387,19 @@ empty_trash (BonoboUIComponent *uih, void *user_data, const char *path) { MailConfigAccount *account; CamelProvider *provider; - CamelFolder *vtrash; const GSList *accounts; + CamelFolder *vtrash; + FolderBrowser *fb; CamelException ex; gboolean async; + fb = user_data ? FOLDER_BROWSER (user_data) : NULL; + /* the only time all three args are NULL is for empty-on-exit */ - async = !(uih == NULL && user_data == NULL && path == NULL); + async = !(uih == NULL && fb == NULL && path == NULL); + + if (fb && !confirm_expunge (fb)) + return; camel_exception_init (&ex); @@ -2404,7 +2410,7 @@ empty_trash (BonoboUIComponent *uih, void *user_data, const char *path) /* make sure this is a valid source */ if (account->source && account->source->enabled && account->source->url) { - provider = camel_session_get_provider (session, account->source->url, &ex); + provider = camel_session_get_provider (session, account->source->url, &ex); if (provider) { /* make sure this store is a remote store */ if (provider->flags & CAMEL_PROVIDER_IS_STORAGE && |