New handy dandy function to ref and return the vfolder storage (will

2001-02-19  Jeffrey Stedfast  <fejj@ximian.com>

	* 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

1 files changed, 9 insertions, 1 deletions

diff --git a/mail/mail-tools.c b/mail/mail-tools.c
index cb4325ca70..87a8872ffc 100644
--- a/mail/mail-tools.c
+++ b/mail/mail-tools.c
@@ -31,6 +31,7 @@
 #include "camel/camel.h"
 #include "camel/providers/vee/camel-vee-folder.h"
 #include "mail-vfolder.h"
+#include "mail-vtrash.h"
 #include "filter/vfolder-rule.h"
 #include "filter/vfolder-context.h"
 #include "filter/filter-option.h"
@@ -307,7 +308,14 @@ mail_tool_uri_to_folder (const char *uri, CamelException *ex)
 	CamelURL *url;
 	CamelStore *store = NULL;
 	CamelFolder *folder = NULL;
-
+	
+	/* FIXME: This is a hack. */
+	if (!strncmp (uri, "vtrash:", 7)) {
+		folder = vtrash_uri_to_folder (uri, ex);
+		if (folder)
+			return folder;
+	}
+	
 	url = camel_url_new (uri, ex);
 	if (!url)
 		return NULL;