if we can't open the pop3 cache dir, because it doesn't exist, it is not

2004-01-19  Not Zed  <NotZed@Ximian.com>

        * em-migrate.c (em_upgrade_pop_uid_caches_1_4): if we can't open
        the pop3 cache dir, because it doesn't exist, it is not an error.

        ** See bug #52983.

        * mail-component.c (em_uri_from_camel, em_uri_to_camel): Handle
        vfolder: uri's properly.  And make sure local uri's are properly
        encoded.
        (mail_component_get_folder_from_evomail_uri)
        (mail_component_evomail_uri_from_folder): removed, no longer used.
        (em_uri_from_camel): don't leak the camelurl.
        (d): disable debug

        * mail-vfolder.c (vfolder_load_storage): move the vfolder storage
        location to ~/.evolution/mail/vfolder rather than
        ~/.evolution/mail (this is currently unused anyway).
        (uri_is_ignore): short-circuit exit if we find a match.
        (mail_vfolder_add_uri): dont exit immediately if we have a vfolder
        uri, but don't add it to local/remove either.
        (mail_vfolder_delete_uri): remove any uri from the local/remote
        source list while we're at it.

svn path=/trunk/; revision=24300

1 files changed, 21 insertions, 3 deletions

diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index 80501b32b0..b1474b7afe 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -311,6 +311,9 @@ uri_is_ignore(const char *uri, GCompareFunc uri_cmp)
 		|| (default_sent_folder_uri && uri_cmp(default_sent_folder_uri, uri))
 		|| (default_drafts_folder_uri && uri_cmp(default_drafts_folder_uri, uri));
 	
+	if (found)
+		return found;
+
 	accounts = mail_config_get_accounts ();
 	iter = e_list_get_iterator ((EList *) accounts);
 	while (e_iterator_is_valid (iter)) {
@@ -347,7 +350,7 @@ mail_vfolder_add_uri(CamelStore *store, const char *curi, int remove)
 	char *uri;
 
 	uri = em_uri_from_camel(curi);
-	if (CAMEL_IS_VEE_STORE(store) || !strncmp(curi, "vtrash:", 7) || !strncmp(curi, "vjunk:", 6) || context == NULL) {
+	if (!strncmp(curi, "vtrash:", 7) || !strncmp(curi, "vjunk:", 6) || context == NULL) {
 		g_free(uri);
 		return;
 	}
@@ -361,7 +364,9 @@ mail_vfolder_add_uri(CamelStore *store, const char *curi, int remove)
 	d(printf("%s uri to check: %s\n", remove?"Removing":"Adding", uri));
 
 	/* maintain the source folders lists for changed rules later on */
-	if (remove) {
+	if (CAMEL_IS_VEE_STORE(store)) {
+		is_ignore = TRUE;
+	} else if (remove) {
 		if (remote) {
 			if ((link = my_list_find(source_folders_remote, (void *)uri, uri_cmp)) != NULL) {
 				g_free(link->data);
@@ -438,6 +443,7 @@ mail_vfolder_delete_uri(CamelStore *store, const char *curi)
 	CamelVeeFolder *vf;
 	GString *changed;
 	char *uri;
+	GList *link;
 
 	if (context == NULL || !strncmp(curi, "vtrash:", 7) || !strncmp(curi, "vjunk:", 6))
 		return;
@@ -471,6 +477,16 @@ mail_vfolder_delete_uri(CamelStore *store, const char *curi)
 			}
 		}
 	}
+
+	if ((link = my_list_find(source_folders_remote, (void *)uri, uri_cmp)) != NULL) {
+		g_free(link->data);
+		source_folders_remote = g_list_remove_link(source_folders_remote, link);
+	}
+
+	if ((link = my_list_find(source_folders_local, (void *)uri, uri_cmp)) != NULL) {
+		g_free(link->data);
+		source_folders_local = g_list_remove_link(source_folders_local, link);
+	}
 	
 	UNLOCK();
 	
@@ -607,6 +623,8 @@ rule_changed(FilterRule *rule, CamelFolder *folder)
 				sources_folder = g_list_append(sources_folder, newfolder);
 			else
 				sources_uri = g_list_append(sources_uri, g_strdup(sourceuri));
+		} else {
+			d(printf("  no i'm not - this folder doesn't exist anywhere\n"));
 		}
 
 		g_free(curi);
@@ -791,7 +809,7 @@ vfolder_load_storage(void)
 	vfolder_hash = g_hash_table_new(g_str_hash, g_str_equal);
 
 	/* first, create the vfolder store, and set it up */
-	storeuri = g_strdup_printf("vfolder:%s/vfolder", mail_component_peek_base_directory (mail_component_peek ()));
+	storeuri = g_strdup_printf("vfolder:%s/mail/vfolder", mail_component_peek_base_directory (mail_component_peek ()));
 	vfolder_store = camel_session_get_store(session, storeuri, NULL);
 	if (vfolder_store == NULL) {
 		g_warning("Cannot open vfolder store - no vfolders available");