** 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

1 files changed, 13 insertions, 11 deletions

diff --git a/mail/mail-component.h b/mail/mail-component.h
index afce0a64d4..5f32dd110b 100644
--- a/mail/mail-component.h
+++ b/mail/mail-component.h
@@ -44,6 +44,14 @@ typedef struct _MailComponent        MailComponent;
 typedef struct _MailComponentPrivate MailComponentPrivate;
 typedef struct _MailComponentClass   MailComponentClass;
 
+enum _mail_component_folder_t {
+	MAIL_COMPONENT_FOLDER_INBOX = 0,
+	MAIL_COMPONENT_FOLDER_DRAFTS,
+	MAIL_COMPONENT_FOLDER_OUTBOX,
+	MAIL_COMPONENT_FOLDER_SENT,
+	MAIL_COMPONENT_FOLDER_LOCAL_INBOX,
+};
+
 struct _MailComponent {
 	BonoboObject parent;
 	
@@ -58,8 +66,11 @@ struct _MailComponentClass {
 
 GType  mail_component_get_type  (void);
 
+struct _BonoboControl *mail_control_new(void);
+
 MailComponent *mail_component_peek  (void);
 
+/* NOTE: Using NULL as the component implies using the default component */
 const char       *mail_component_peek_base_directory    (MailComponent *component);
 RuleContext      *mail_component_peek_search_context    (MailComponent *component);
 EActivityHandler *mail_component_peek_activity_handler  (MailComponent *component);
@@ -85,16 +96,7 @@ void mail_component_remove_folder (MailComponent *component, CamelStore *store,
 
 struct _EMFolderTreeModel *mail_component_peek_tree_model (MailComponent *component);
 
-struct _CamelFolder *mail_component_get_local_inbox(MailComponent *mc, struct _CamelException *ex);
-
-char *em_uri_from_camel (const char *curi);
-char *em_uri_to_camel (const char *euri);
-
-CamelFolder *mail_component_get_folder_from_evomail_uri  (MailComponent  *component,
-							  guint32         flags,
-							  const char     *evomail_uri,
-							  CamelException *ex);
-char        *mail_component_evomail_uri_from_folder      (MailComponent  *component,
-							  CamelFolder    *folder);
+struct _CamelFolder *mail_component_get_folder(MailComponent *mc, enum _mail_component_folder_t id);
+const char *mail_component_get_folder_uri(MailComponent *mc, enum _mail_component_folder_t id);
 
 #endif /* _MAIL_COMPONENT_H_ */