diff options
| author | Dan Winship <danw@src.gnome.org> | 2000-09-06 03:43:08 +0800 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2000-09-06 03:43:08 +0800 |
| commit | 362fa5361015a75817e6990331a295e96efa6dd4 (patch) | |
| tree | 7a7bddff1336ab7509dee702df6f423a1794226a /mail/component-factory.c | |
| parent | 84680074b11f7a20f8e1e76975321b6daf706966 (diff) | |
| download | gsoc2013-evolution-362fa5361015a75817e6990331a295e96efa6dd4.tar gsoc2013-evolution-362fa5361015a75817e6990331a295e96efa6dd4.tar.gz gsoc2013-evolution-362fa5361015a75817e6990331a295e96efa6dd4.tar.bz2 gsoc2013-evolution-362fa5361015a75817e6990331a295e96efa6dd4.tar.lz gsoc2013-evolution-362fa5361015a75817e6990331a295e96efa6dd4.tar.xz gsoc2013-evolution-362fa5361015a75817e6990331a295e96efa6dd4.tar.zst gsoc2013-evolution-362fa5361015a75817e6990331a295e96efa6dd4.zip | |
Replace mail_do_setup_draftbox, mail_do_setup_outbox, and
* mail-ops.c: Replace mail_do_setup_draftbox,
mail_do_setup_outbox, and mail_do_setup_sentbox with
mail_do_setup_folder.
(do_send_mail, do_send_queue): s/sentbox_folder/sent_folder/
* component-factory.c (owner_set_cb): Use mail_do_setup_folder,
rename sentbox_folder to sent_folder, and call
mail_operation_wait_for_finish after the setup_folder calls in
case anything needs to use the _folder variables.
svn path=/trunk/; revision=5200
Diffstat (limited to 'mail/component-factory.c')
| -rw-r--r-- | mail/component-factory.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/mail/component-factory.c b/mail/component-factory.c index db6e86118d..636776692d 100644 --- a/mail/component-factory.c +++ b/mail/component-factory.c @@ -44,7 +44,7 @@ CamelFolder *drafts_folder = NULL; CamelFolder *outbox_folder = NULL; -CamelFolder *sentbox_folder = NULL; /* this one should be configurable? */ +CamelFolder *sent_folder = NULL; /* this one should be configurable? */ char *evolution_dir; static void create_vfolder_storage (EvolutionShellComponent *shell_component); @@ -117,9 +117,12 @@ owner_set_cb (EvolutionShellComponent *shell_component, evolution_dir = g_strdup (evolution_homedir); mail_config_init (); - mail_do_setup_draftbox (); - mail_do_setup_outbox (); - mail_do_setup_sentbox (); + mail_do_setup_folder ("Drafts", &drafts_folder); + mail_do_setup_folder ("Outbox", &outbox_folder); + mail_do_setup_folder ("Sent Messages", &sent_folder); + /* Don't proceed until those _folder variables are valid. */ + mail_operation_wait_for_finish (); + create_vfolder_storage (shell_component); corba_shell = bonobo_object_corba_objref (BONOBO_OBJECT (shell_client)); |