aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog5
-rw-r--r--shell/e-corba-storage.c6
-rw-r--r--shell/e-storage.c4
3 files changed, 14 insertions, 1 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 3446cf5192..563f5fcdae 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-14 Dan Winship <danw@ximian.com>
+
+ * e-corba-storage.c (async_folder_cb):
+ * e-storage.c (e_storage_result_to_string): Add two missing codes.
+
2001-10-13 Dan Winship <danw@ximian.com>
* evolution-shell-component-utils.c (e_activation_failure_dialog):
diff --git a/shell/e-corba-storage.c b/shell/e-corba-storage.c
index e4ceaa8c3e..2e3a60b401 100644
--- a/shell/e-corba-storage.c
+++ b/shell/e-corba-storage.c
@@ -302,6 +302,9 @@ async_folder_cb (BonoboListener *listener, char *event_name,
case GNOME_Evolution_Storage_UNSUPPORTED_TYPE:
result = E_STORAGE_UNSUPPORTEDTYPE;
break;
+ case GNOME_Evolution_Storage_INVALID_URI:
+ result = E_STORAGE_INVALIDNAME;
+ break;
case GNOME_Evolution_Storage_ALREADY_EXISTS:
result = E_STORAGE_EXISTS;
break;
@@ -314,8 +317,9 @@ async_folder_cb (BonoboListener *listener, char *event_name,
case GNOME_Evolution_Storage_NO_SPACE:
result = E_STORAGE_NOSPACE;
break;
- case GNOME_Evolution_Storage_INVALID_URI:
case GNOME_Evolution_Storage_NOT_EMPTY:
+ result = E_STORAGE_NOTEMPTY;
+ break;
case GNOME_Evolution_Storage_GENERIC_ERROR:
default:
result = E_STORAGE_GENERICERROR;
diff --git a/shell/e-storage.c b/shell/e-storage.c
index 0dc4d9a2f4..ec6ea67d6a 100644
--- a/shell/e-storage.c
+++ b/shell/e-storage.c
@@ -507,6 +507,8 @@ e_storage_result_to_string (EStorageResult result)
return _("I/O error");
case E_STORAGE_NOSPACE:
return _("Not enough space to create the folder");
+ case E_STORAGE_NOTEMPTY:
+ return _("The folder is not empty");
case E_STORAGE_NOTFOUND:
return _("The specified folder was not found");
case E_STORAGE_NOTIMPLEMENTED:
@@ -521,6 +523,8 @@ e_storage_result_to_string (EStorageResult result)
return _("The specified folder cannot be modified or removed");
case E_STORAGE_CANTMOVETODESCENDANT:
return _("Cannot make a folder a child of one of its descendants");
+ case E_STORAGE_INVALIDNAME:
+ return _("Cannot create a folder with that name");
default:
return _("Unknown error");
}