diff options
author | Dan Winship <danw@src.gnome.org> | 2001-10-02 03:45:39 +0800 |
---|---|---|
committer | Dan Winship <danw@src.gnome.org> | 2001-10-02 03:45:39 +0800 |
commit | 8d3a2ebd284bbcde524a40054970c03ef7e07426 (patch) | |
tree | e4fd6a50b33358afe5cd7d77de97a4398b117e3d /mail/mail-send-recv.c | |
parent | a9decdd87985fd66f202aa118d5e81d774734420 (diff) | |
download | gsoc2013-evolution-8d3a2ebd284bbcde524a40054970c03ef7e07426.tar.gz gsoc2013-evolution-8d3a2ebd284bbcde524a40054970c03ef7e07426.tar.zst gsoc2013-evolution-8d3a2ebd284bbcde524a40054970c03ef7e07426.zip |
create storages for providers that are STORAGE and aren't EXTERNAL, rather
* component-factory.c (mail_load_storage_by_uri): create storages
for providers that are STORAGE and aren't EXTERNAL, rather than
"(STORAGE and REMOTE) or spool, maildir, or vfolder".
(mail_remove_storage_by_uri): Use the same rule here (which makes
it possible now to remove maildir and spool stores now, which
weren't properly special-cased before). Remove some CamelException
misuse.
* mail-config.c (new_source_created): Fix up the broken INBOX-
shortcut-generating assumption a little by only assuming that if
you call camel_store_get_inbox(), that its full_name is the same
as its path. (This happens to always be true for inboxes now, and
will be always true by definition at some point in the future.)
Now maildir stores get working Inbox shortcuts.
* mail-send-recv.c (get_receive_type): If PROVIDER_IS_STORAGE
then use SEND_UPDATE, if not, use SEND_RECEIVE.
* mail-local.c (local_provider): The local provider is EXTERNAL.
(The shell creates it.)
(mail_local_reconfigure_folder): Allow reconfiguring between
IS_LOCAL providers.
* mail-accounts.c (news_delete): Don't need to check the provider
flags here... we know nntp is a STORAGE.
svn path=/trunk/; revision=13277
Diffstat (limited to 'mail/mail-send-recv.c')
-rw-r--r-- | mail/mail-send-recv.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c index db5e23483a..d1d619b0dd 100644 --- a/mail/mail-send-recv.c +++ b/mail/mail-send-recv.c @@ -253,9 +253,10 @@ format_url(const char *internal_url) static send_info_t get_receive_type(const char *url) { - if (!strncmp(url, "imap:", 5) - || !strncmp(url, "spool:", 6) - || !strncmp(url, "maildir:", 8)) + CamelProvider *provider; + + provider = camel_session_get_provider (session, url, NULL); + if (provider->flags & CAMEL_PROVIDER_IS_STORAGE) return SEND_UPDATE; else return SEND_RECEIVE; @@ -301,7 +302,6 @@ build_dialogue (GSList *sources, CamelFolder *outbox, const char *destination) info = g_hash_table_lookup (data->active, source->url); if (info == NULL) { info = g_malloc0 (sizeof (*info)); - /* imap and spool are handled differently */ info->type = get_receive_type(source->url); d(printf("adding source %s\n", source->url)); @@ -795,7 +795,6 @@ mail_receive_uri (const char *uri, int keep) d(printf("starting non-interactive download of '%s'\n", uri)); info = g_malloc0 (sizeof (*info)); - /* imap is handled differently */ info->type = get_receive_type(uri); info->bar = NULL; info->status = NULL; |