diff options
| author | Not Zed <NotZed@Ximian.com> | 2002-07-24 13:23:53 +0800 |
|---|---|---|
| committer | Michael Zucci <zucchi@src.gnome.org> | 2002-07-24 13:23:53 +0800 |
| commit | 8c88d15dd503cab462365de378604fb83fd8a295 (patch) | |
| tree | 72335052a2f9aa2c92362abc9d2fea5584c8608b /mail/component-factory.c | |
| parent | 975b2f33f985cb9f57c8fc19b481de6a147cb49e (diff) | |
| download | gsoc2013-evolution-8c88d15dd503cab462365de378604fb83fd8a295.tar.gz gsoc2013-evolution-8c88d15dd503cab462365de378604fb83fd8a295.tar.zst gsoc2013-evolution-8c88d15dd503cab462365de378604fb83fd8a295.zip | |
Initialise the standard uri's before doing anything else.
2002-07-24 Not Zed <NotZed@Ximian.com>
* component-factory.c (owner_set_cb): Initialise the standard
uri's before doing anything else.
* mail-vfolder.c (uri_is_ignore): Return true if the uri is any
sent, drafts or outbox folder uri.
(mail_vfolder_add_uri): Dont automagically add any
sent/outbox/drafts folder with "local" or "remote" etc rules, only
add sent folders if explictly listed as folder rules. Maintain
the remote/local folders list accordingly.
(vfolder_adduri_do): dont check against sent_folder, drafts_folder
or outbox_folder, this is checked by above code. For #14863.
svn path=/trunk/; revision=17564
Diffstat (limited to 'mail/component-factory.c')
| -rw-r--r-- | mail/component-factory.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mail/component-factory.c b/mail/component-factory.c index ad9d424356..0dc164d0fb 100644 --- a/mail/component-factory.c +++ b/mail/component-factory.c @@ -716,6 +716,9 @@ owner_set_cb (EvolutionShellComponent *shell_component, storages_hash = g_hash_table_new (NULL, NULL); corba_shell = bonobo_object_corba_objref (BONOBO_OBJECT (shell_client)); + + for (i = 0; i < sizeof (standard_folders) / sizeof (standard_folders[0]); i++) + *standard_folders[i].uri = g_strdup_printf ("file://%s/local/%s", evolution_dir, standard_folders[i].name); vfolder_load_storage(corba_shell); @@ -726,7 +729,6 @@ owner_set_cb (EvolutionShellComponent *shell_component, mail_importer_init (shell_client); for (i = 0; i < sizeof (standard_folders) / sizeof (standard_folders[0]); i++) { - *standard_folders[i].uri = g_strdup_printf ("file://%s/local/%s", evolution_dir, standard_folders[i].name); mail_msg_wait (mail_get_folder (*standard_folders[i].uri, CAMEL_STORE_FOLDER_CREATE, got_folder, standard_folders[i].folder, mail_thread_new)); } |