diff options
| -rw-r--r-- | mail/folder-browser.h | 2 | ||||
| -rw-r--r-- | mail/mail-callbacks.c | 13 |
2 files changed, 6 insertions, 9 deletions
diff --git a/mail/folder-browser.h b/mail/folder-browser.h index 7a92ebf3ae..f290587498 100644 --- a/mail/folder-browser.h +++ b/mail/folder-browser.h @@ -25,7 +25,7 @@ #define FB_DEFAULT_CHARSET _("Default") -#define FOLDER_BROWSER_IS_DESTROYED(fb) (!fb || !fb->folder || !fb->message_list || !fb->mail_display) +#define FOLDER_BROWSER_IS_DESTROYED(fb) (!fb || !fb->message_list || !fb->mail_display) typedef enum _FolderBrowserSelectionState { FB_SELSTATE_NONE, diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c index 4d9d856c8d..96fb7c6bca 100644 --- a/mail/mail-callbacks.c +++ b/mail/mail-callbacks.c @@ -173,12 +173,9 @@ check_send_configuration (FolderBrowser *fb) { const MailConfigAccount *account; - if (FOLDER_BROWSER_IS_DESTROYED (fb)) - return FALSE; - /* Check general */ - if (!mail_config_is_configured () || !configure_mail (fb)) - return FALSE; + if (!mail_config_is_configured () && !configure_mail (fb)) + return FALSE; /* Get the default account */ account = mail_config_get_default_account (); @@ -224,8 +221,8 @@ send_receive_mail (GtkWidget *widget, gpointer user_data) if (FOLDER_BROWSER_IS_DESTROYED (fb)) return; - if (!mail_config_is_configured () || !configure_mail (fb)) - return; + if (!mail_config_is_configured () && !configure_mail (fb)) + return; account = mail_config_get_default_account (); if (!account || !account->transport) { @@ -2478,7 +2475,7 @@ empty_trash (BonoboUIComponent *uih, void *user_data, const char *path) fb = user_data ? FOLDER_BROWSER (user_data) : NULL; - if (FOLDER_BROWSER_IS_DESTROYED (fb) || !confirm_expunge (fb)) + if (fb && !confirm_expunge (fb)) return; camel_exception_init (&ex); |