Deal with "mailstorage" type views (top-level mail storages) by trying to

	* component-factory.c (create_view): Deal with "mailstorage" type
	views (top-level mail storages) by trying to fill the storage's
	folder tree again if we failed before.
	(add_storage): Create new storages with a URI and type
	"mailstorage".

	* mail-ops.c (cleanup_scan_subfolders): On success, mark the
	storage as having been loaded, so create_view won't try again.

svn path=/trunk/; revision=6923

1 files changed, 5 insertions, 0 deletions

diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 3b23c453a0..baa026acb7 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -1373,6 +1373,11 @@ cleanup_scan_subfolders (gpointer in_data, gpointer op_data,
 	}
 	g_ptr_array_free (data->new_folders, TRUE);
 
+	if (!camel_exception_is_set (ex)) {
+		gtk_object_set_data (GTK_OBJECT (input->storage),
+				     "connected", GINT_TO_POINTER (1));
+	}
+
 	gtk_object_unref (GTK_OBJECT (input->storage));
 	camel_object_unref (CAMEL_OBJECT (input->store));
 }