Function to add a store/storage mapping. (add_storage): Use it.

	* component-factory.c (mail_hash_storage): Function to add a
	store/storage mapping.
	(add_storage): Use it.

	* mail-vfolder.c (vfolder_uri_to_folder): Use the vfolder name
	rather than the string "mbox" (which wasn't ever used for
	anything) in the vfolder URL. (Combined with the CamelVeeFolder
	change, this makes camel_folder_get_name() return a pretty name
	for vfolders now.) Call mail_hash_storage() to record the
	CamelVeeStore/vfolder_storage mapping. (Ideally, there'd only be a
	single CamelVeeStore... this is just a quick hack.)

	vfolders now display their unread count once you've looked at them
	once.

svn path=/trunk/; revision=7712

1 files changed, 5 insertions, 1 deletions

diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index 64e92cd072..fb06a8479a 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -21,6 +21,7 @@
 #include "mail-vfolder.h"
 #include "mail-tools.h"
 #include "mail-autofilter.h"
+#include "mail.h"
 
 #include "camel/camel.h"
 
@@ -194,11 +195,14 @@ vfolder_uri_to_folder(const char *uri, CamelException *ex)
 	rule = (VfolderRule *)rule_context_find_rule((RuleContext *)context, info->name, NULL);
 
 	storeuri = g_strdup_printf("vfolder:%s/vfolder/%s", evolution_dir, info->name);
-	foldername = g_strdup_printf("mbox?%s", info->query);
+	foldername = g_strdup_printf("%s?%s", info->name, info->query);
 
 	/* we dont have indexing on vfolders */
 	folder = mail_tool_get_folder_from_urlname (storeuri, foldername, CAMEL_STORE_FOLDER_CREATE, ex);
 
+	bonobo_object_ref (BONOBO_OBJECT (vfolder_storage));
+	mail_hash_storage ((CamelService *)folder->parent_store, vfolder_storage);
+
 	sourceuri = NULL;
 	sources = 0;
 	while ( (sourceuri = vfolder_rule_next_source(rule, sourceuri)) ) {