diff options
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/ChangeLog | 6 | ||||
| -rw-r--r-- | mail/mail-account-gui.c | 3 | ||||
| -rw-r--r-- | mail/mail-component.c | 6 | ||||
| -rw-r--r-- | mail/mail-offline-handler.c | 3 |
4 files changed, 10 insertions, 8 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog index adb87f4d10..b47b2fa701 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,9 @@ +2004-01-29 Nicel KM <mnicel@novell.com> + + * mail-component.c: removed CAMEL_PROVIDER_IS_EXTERNAL check + * mail-account-gui.c: likewise + * mail-offline-handler.c: likewise + 2004-01-29 Not Zed <NotZed@Ximian.com> * em-format-html-display.c (efhd_attachment_button): check the diff --git a/mail/mail-account-gui.c b/mail/mail-account-gui.c index 2864adba2f..b24ac827d5 100644 --- a/mail/mail-account-gui.c +++ b/mail/mail-account-gui.c @@ -2041,8 +2041,7 @@ mail_account_gui_save (MailAccountGui *gui) new->smime_encrypt_to_self = gtk_toggle_button_get_active (gui->smime_encrypt_to_self); #endif /* HAVE_NSS */ - is_storage = provider && (provider->flags & CAMEL_PROVIDER_IS_STORAGE) && - !(provider->flags & CAMEL_PROVIDER_IS_EXTERNAL); + is_storage = provider && (provider->flags & CAMEL_PROVIDER_IS_STORAGE); if (!mail_config_find_account (account)) { /* this is a new account so add it to our account-list */ diff --git a/mail/mail-component.c b/mail/mail-component.c index 2aaccfe8c8..bda9d9801d 100644 --- a/mail/mail-component.c +++ b/mail/mail-component.c @@ -679,8 +679,7 @@ mail_component_load_store_by_uri (MailComponent *component, const char *uri, con return NULL; } - if (!(prov->flags & CAMEL_PROVIDER_IS_STORAGE) - || (prov->flags & CAMEL_PROVIDER_IS_EXTERNAL)) + if (!(prov->flags & CAMEL_PROVIDER_IS_STORAGE)) return NULL; store = (CamelStore *) camel_session_get_service (session, uri, CAMEL_PROVIDER_STORE, &ex); @@ -747,8 +746,7 @@ mail_component_remove_store_by_uri (MailComponent *component, const char *uri) if (!(prov = camel_session_get_provider (session, uri, NULL))) return; - if (!(prov->flags & CAMEL_PROVIDER_IS_STORAGE) || - (prov->flags & CAMEL_PROVIDER_IS_EXTERNAL)) + if (!(prov->flags & CAMEL_PROVIDER_IS_STORAGE)) return; store = (CamelStore *) camel_session_get_service (session, uri, CAMEL_PROVIDER_STORE, NULL); diff --git a/mail/mail-offline-handler.c b/mail/mail-offline-handler.c index b7cff8b65a..28cecf2e43 100644 --- a/mail/mail-offline-handler.c +++ b/mail/mail-offline-handler.c @@ -50,8 +50,7 @@ struct _MailOfflineHandlerPrivate { static gboolean service_is_relevant (CamelService *service, gboolean going_offline) { - if (!(service->provider->flags & CAMEL_PROVIDER_IS_REMOTE) || - (service->provider->flags & CAMEL_PROVIDER_IS_EXTERNAL)) + if (!(service->provider->flags & CAMEL_PROVIDER_IS_REMOTE)) return FALSE; if (CAMEL_IS_DISCO_STORE (service) && |