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, 5 insertions, 0 deletions

diff --git a/mail/em-migrate.c b/mail/em-migrate.c
index 26c3c9c566..44286f8739 100644
--- a/mail/em-migrate.c
+++ b/mail/em-migrate.c
@@ -1685,6 +1685,11 @@ em_upgrade_pop_uid_caches_1_4 (const char *evolution_dir, CamelException *ex)
 	/* open the old cache dir */
 	cache_dir = g_build_filename (g_get_home_dir (), "evolution", "mail", "pop3", NULL);
 	if (!(dir = opendir (cache_dir))) {
+		if (errno == ENOENT) {
+			g_free(cache_dir);
+			return 0;
+		}
+
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
 				      _("Failed to migrate pop3 uid caches: %s"),
 				      g_strerror (errno));