[Finally! Fix #413, "Support for stock folders", and #786, "i18n:

default folder names are not translated".]

* e-local-storage.c (setup_folder_as_stock): New helper function.
(setup_stock_folders): Use it to set the default folders as
"stock" folders.  This will give them a translated name and also
make them unmodifiable.
(load_all_folders): Call `setup_stock_folders()' here.

* e-shell-folder-commands.c (delete_cb): Display an error dialog
if the deletion fails.
(e_shell_command_delete_folder): Pass the shell view to the delete
callback.

* e-storage.c (e_storage_result_to_string): Add a string for
`E_STORAGE_CANTCHANGESTOCKFOLDER' as well.

* e-local-storage.c (remove_folder): Don't allow a stock folder to
be removed.
(impl_async_xfer_folder): Don't allow a stock folder to be moved.

* e-corba-storage.c (async_remove_folder): Don't allow a stock
folder to be removed.

* e-storage.h: New enum value `E_STORAGE_CANTCHANGESTOCKFOLDER' in
`EStorageResult'.

* e-folder.c: Make member `self_highlight' a :1 int.  New :1 int
member `is_stock'.
(init): Init `is_stock' to %FALSE.
(e_folder_set_is_stock): New.
(e_folder_get_is_stock): New.

* e-local-storage.c (bonobo_interface_update_folder_cb): For now,
don't set the display name.

svn path=/trunk/; revision=11931

1 files changed, 2 insertions, 0 deletions

diff --git a/shell/e-storage.c b/shell/e-storage.c
index 00f07f0250..3ef8041d8a 100644
--- a/shell/e-storage.c
+++ b/shell/e-storage.c
@@ -497,6 +497,8 @@ e_storage_result_to_string (EStorageResult result)
 		return _("Operation not supported");
 	case E_STORAGE_UNSUPPORTEDTYPE:
 		return _("The specified type is not supported in this storage");
+	case E_STORAGE_CANTCHANGESTOCKFOLDER:
+		return _("The specified folder cannot be modified or removed");
 	default:
 		return _("Unknown error");
 	}