Use the name of the storage or the folder in the storage set view,

instead of just the last segment of the path, so that we can support
display names correctly.

svn path=/trunk/; revision=5296

1 files changed, 2 insertions, 0 deletions

diff --git a/shell/e-storage-set.c b/shell/e-storage-set.c
index 7b18d93c1c..405c3e2c61 100644
--- a/shell/e-storage-set.c
+++ b/shell/e-storage-set.c
@@ -452,6 +452,8 @@ e_storage_set_get_folder (EStorageSet *storage_set,
 	g_return_val_if_fail (g_path_is_absolute (path), NULL);
 
 	storage = get_storage_for_path (storage_set, path, &subpath);
+	if (storage == NULL)
+		return NULL;
 
 	return e_storage_get_folder (storage, subpath);
 }