Set the is_stock flag to TRUE for the summary folder.

* e-shell.c (setup_local_storage): Set the is_stock flag to TRUE
for the summary folder.

* e-shell-view.c (setup_verb_sensitivity_for_folder): Don't allow
folder operations on pseudo-folders that have a NULL physical_uri.

* e-corba-storage.c (async_remove_folder): Make sure the folder
has a physical URI.  [#30950]

* e-shell-shared-folder-picker-dialog.c
(setup_server_option_menu): Use
e_utf8_gtk_menu_item_new_with_label() to create the option menu
items from the storage's UTF-8 name.  [#31564]

svn path=/trunk/; revision=18419

1 files changed, 11 insertions, 3 deletions

diff --git a/shell/e-corba-storage.c b/shell/e-corba-storage.c
index 4f5ca6dc1b..31e8c424f1 100644
--- a/shell/e-corba-storage.c
+++ b/shell/e-corba-storage.c
@@ -351,8 +351,10 @@ async_create_folder (EStorage *storage, const char *path,
 }
 
 static void
-async_remove_folder (EStorage *storage, const char *path,
-		     EStorageResultCallback callback, void *data)
+async_remove_folder (EStorage *storage,
+		     const char *path,
+		     EStorageResultCallback callback,
+		     void *data)
 {
 	ECorbaStorage *corba_storage;
 	ECorbaStoragePrivate *priv;
@@ -366,8 +368,14 @@ async_remove_folder (EStorage *storage, const char *path,
 	priv = corba_storage->priv;
 
 	folder = e_storage_get_folder (storage, path);
-	if (e_folder_get_is_stock (folder))
+	if (e_folder_get_is_stock (folder)) {
 		(* callback) (storage, E_STORAGE_CANTCHANGESTOCKFOLDER, data);
+		return;
+	}
+	if (e_folder_get_physical_uri (folder) == NULL) {
+		(* callback) (storage, E_STORAGE_GENERICERROR, data);
+		return;
+	}
 
 	closure = g_new (struct async_folder_closure, 1);
 	closure->callback = callback;