From 63f1ba7ab140cada16c54ad9913a3f95ff565410 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Mon, 19 Feb 2001 23:38:53 +0000 Subject: New handy dandy function to ref and return the vfolder storage (will 2001-02-19 Jeffrey Stedfast * mail-vfolder.c (mail_vfolder_get_vfolder_storage): New handy dandy function to ref and return the vfolder storage (will probably be disavowed once I figure out how to get the vTrash folder to show up in the EvolutionLocalStorage). * main.c (main): Call vtrash_cleanup(). * mail-vtrash.c: New file. (vtrash_uri_to_folder): vtrash: URI handler (vtrash_create): Replacement async vtrash function for the old one in mail-ops.c (vtrash_cleanup): Cleanup code - unrefs the cached vtrash folders and free's the hashtable. * Makefile.am: Added mail-vtrash.[c,h]. * mail-tools.c (mail_tool_uri_to_folder): If we have a vtrash: URI, call the vtrash URI handler function rather than continuing on. Yes, I know this is a hack and it needs to be fixed. * mail-ops.c (mail_do_setup_trash): Removed. (mail_trash_get): Removed. * component-factory.c (owner_set_cb): Create the vTrash folder for the LocalStore here. * mail-local.c (get_folder_info): Implement. svn path=/trunk/; revision=8288 --- mail/component-factory.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'mail/component-factory.c') diff --git a/mail/component-factory.c b/mail/component-factory.c index f2c977ab34..11adaefcac 100644 --- a/mail/component-factory.c +++ b/mail/component-factory.c @@ -43,6 +43,7 @@ #include "mail-mt.h" #include "mail-importer.h" #include "mail-vfolder.h" /* vfolder_create_storage */ +#include "mail-vtrash.h" #include "openpgp-utils.h" #include @@ -54,7 +55,6 @@ CamelFolder *drafts_folder = NULL; CamelFolder *outbox_folder = NULL; CamelFolder *sent_folder = NULL; /* this one should be configurable? */ -CamelFolder *trash_folder = NULL; char *evolution_dir; #define COMPONENT_FACTORY_ID "OAFIID:GNOME_Evolution_Mail_ShellComponentFactory" @@ -215,9 +215,7 @@ owner_set_cb (EvolutionShellComponent *shell_component, g_free (uri); } - /*mail_msg_wait (mail_get_trash ("file:/", got_folder, &trash_folder));*/ - mail_do_setup_trash (_("Trash"), "file:/", &trash_folder); - mail_operation_wait_for_finish (); + mail_msg_wait (vtrash_create ("file:/", NULL, NULL)); mail_session_enable_interaction (TRUE); -- cgit v1.2.3