aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog13
-rw-r--r--shell/Evolution-Storage.idl1
-rw-r--r--shell/e-corba-storage.c2
-rw-r--r--shell/e-storage.c2
-rw-r--r--shell/e-storage.h1
5 files changed, 19 insertions, 0 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 6223947716..c0d5935994 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,18 @@
2002-09-17 Ettore Perazzoli <ettore@ximian.com>
+ * e-storage.c (e_storage_result_to_string): Add description for
+ E_STORAGE_NOTONLINE.
+
+ * e-corba-storage.c
+ (e_corba_storage_corba_result_to_storage_result): Support
+ GNOME_Evolution_Storage_NOT_ONLINE (E_STORAGE_NOTONLINE).
+
+ * Evolution-Storage.idl: Add NOT_ONLINE to enum Result.
+
+ * e-storage.h: Add E_STORAGE_NOTONLINE to EStorageResult enum.
+
+2002-09-17 Ettore Perazzoli <ettore@ximian.com>
+
* e-storage-set-view.c (sort_idle_callback): Remove unused
variable.
diff --git a/shell/Evolution-Storage.idl b/shell/Evolution-Storage.idl
index 844f7255f6..02506af4ec 100644
--- a/shell/Evolution-Storage.idl
+++ b/shell/Evolution-Storage.idl
@@ -29,6 +29,7 @@ module Evolution {
PERMISSION_DENIED,
NO_SPACE,
NOT_EMPTY,
+ NOT_ONLINE,
GENERIC_ERROR
};
diff --git a/shell/e-corba-storage.c b/shell/e-corba-storage.c
index 12a43eb2cc..d50a01e921 100644
--- a/shell/e-corba-storage.c
+++ b/shell/e-corba-storage.c
@@ -704,6 +704,8 @@ e_corba_storage_corba_result_to_storage_result (GNOME_Evolution_Storage_Result c
return E_STORAGE_NOSPACE;
case GNOME_Evolution_Storage_NOT_EMPTY:
return E_STORAGE_NOTEMPTY;
+ case GNOME_Evolution_Storage_NOT_ONLINE:
+ return E_STORAGE_NOTONLINE;
case GNOME_Evolution_Storage_GENERIC_ERROR:
default:
return E_STORAGE_GENERICERROR;
diff --git a/shell/e-storage.c b/shell/e-storage.c
index 8db704883b..df8a21faa1 100644
--- a/shell/e-storage.c
+++ b/shell/e-storage.c
@@ -512,6 +512,8 @@ e_storage_result_to_string (EStorageResult result)
return _("Cannot make a folder a child of one of its descendants");
case E_STORAGE_INVALIDNAME:
return _("Cannot create a folder with that name");
+ case E_STORAGE_NOTONLINE:
+ return _("This operation cannot be performed in off-line mode");
default:
return _("Unknown error");
}
diff --git a/shell/e-storage.h b/shell/e-storage.h
index 0213653408..22d87de8f9 100644
--- a/shell/e-storage.h
+++ b/shell/e-storage.h
@@ -58,6 +58,7 @@ enum _EStorageResult {
E_STORAGE_UNSUPPORTEDTYPE,
E_STORAGE_CANTCHANGESTOCKFOLDER,
E_STORAGE_CANTMOVETODESCENDANT,
+ E_STORAGE_NOTONLINE,
E_STORAGE_INVALIDNAME
};
typedef enum _EStorageResult EStorageResult;