diff options
| author | Not Zed <NotZed@Ximian.com> | 2004-01-27 20:35:26 +0800 |
|---|---|---|
| committer | Michael Zucci <zucchi@src.gnome.org> | 2004-01-27 20:35:26 +0800 |
| commit | ce042b31b62f51282a3e66d1d0725fd5236d9096 (patch) | |
| tree | 61c6c032f5d7fcdfb2ee7b7dd9cd96bd84e629ad /mail/mail-vfolder.c | |
| parent | 2cf803cfc656c511342b5d80f464fe590b3f5d9d (diff) | |
| download | gsoc2013-evolution-ce042b31b62f51282a3e66d1d0725fd5236d9096.tar gsoc2013-evolution-ce042b31b62f51282a3e66d1d0725fd5236d9096.tar.gz gsoc2013-evolution-ce042b31b62f51282a3e66d1d0725fd5236d9096.tar.bz2 gsoc2013-evolution-ce042b31b62f51282a3e66d1d0725fd5236d9096.tar.lz gsoc2013-evolution-ce042b31b62f51282a3e66d1d0725fd5236d9096.tar.xz gsoc2013-evolution-ce042b31b62f51282a3e66d1d0725fd5236d9096.tar.zst gsoc2013-evolution-ce042b31b62f51282a3e66d1d0725fd5236d9096.zip | |
** See bug #53084 and others.
2004-01-27 Not Zed <NotZed@Ximian.com>
** See bug #53084 and others.
* em-migrate.c (em_migrate): remove the vfolder_revert hack.
* em-composer-utils.c (ask_confirm_for_only_bcc): removed unused
vars.
* mail-tools.c (mail_tool_get_local_inbox): removed, handled by
mail_component_get_folder now.
* mail-component.c (mail_component_*): Changed the api slightly.
Using NULL as the component argument automatically implies you
want the default component.
(em_uri_from_camel, em_uri_to_camel): moved to em-utils.[ch]. Ok
so it isn't namespaced right ... *shrug*.
(mail_component_get_local_inbox): removed.
(mail_component_get_folder): single entry point for getting
standard folders. This is MT-Safe.
(mail_component_get_folder_uri): single entry point for getting
standard folder uri's. This is MT-Safe.
(add_store): removed, moved to mail_component_add_store.
(mail_component_load_store_by_uri): call mail_component_add_store
directly rather than copying its code.
(default_*_folder*): Removed, use accessor methods instead, fixed
all callers.
(setup_local_store): renamed to mc_setup_local_store, use proper
url encoding too. make run-once and thread-safe.
(MailComponentPrivate): Added a lock.
(mail_control_new): exported properly to kill warnings.
(mail_component_init): dont setup_local_store or add accounts
here.
(impl_createControls): setup local store/accounts here.
(mail_component_peek): dont setup vfolder storage here.
(mc_startup): internal function to startup stuff needed for gui
operation.
(setup_search_context): make run-once.
(mail_component_peek_search_context): call setup_search_context
incase it isn't setup yet.
(impl_upgradeFromVersion): remove the local store setup hack.
svn path=/trunk/; revision=24462
Diffstat (limited to 'mail/mail-vfolder.c')
| -rw-r--r-- | mail/mail-vfolder.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c index fc0e502c8f..65954efbe4 100644 --- a/mail/mail-vfolder.c +++ b/mail/mail-vfolder.c @@ -299,7 +299,6 @@ my_list_find(GList *l, const char *uri, GCompareFunc cmp) static int uri_is_ignore(const char *uri, GCompareFunc uri_cmp) { - extern char *default_outbox_folder_uri, *default_sent_folder_uri, *default_drafts_folder_uri; EAccountList *accounts; EAccount *account; EIterator *iter; @@ -307,9 +306,9 @@ uri_is_ignore(const char *uri, GCompareFunc uri_cmp) d(printf("checking '%s' against:\n %s\n %s\n %s\n", uri, default_outbox_folder_uri, default_sent_folder_uri, default_drafts_folder_uri)); - found = (default_outbox_folder_uri && uri_cmp(default_outbox_folder_uri, uri)) - || (default_sent_folder_uri && uri_cmp(default_sent_folder_uri, uri)) - || (default_drafts_folder_uri && uri_cmp(default_drafts_folder_uri, uri)); + found = uri_cmp(mail_component_get_folder_uri(NULL, MAIL_COMPONENT_FOLDER_OUTBOX), uri) + || uri_cmp(mail_component_get_folder_uri(NULL, MAIL_COMPONENT_FOLDER_SENT), uri) + || uri_cmp(mail_component_get_folder_uri(NULL, MAIL_COMPONENT_FOLDER_DRAFTS), uri); if (found) return found; |