aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog5
-rw-r--r--shell/e-shell-utils.c10
2 files changed, 13 insertions, 2 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 9e1cb24630..df9895e1e2 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,10 @@
2003-03-06 Ettore Perazzoli <ettore@ximian.com>
+ * e-shell-utils.c (e_shell_folder_name_is_valid): Do not allow
+ names with a "#" in them either.
+
+2003-03-06 Ettore Perazzoli <ettore@ximian.com>
+
* e-shell-view.c (update_other_users_folder_items_sensitivity):
New function to toggle the "open other user's folder" menu item
sensitivity on or off depending on whether there are any storages
diff --git a/shell/e-shell-utils.c b/shell/e-shell-utils.c
index a983a7b768..195b25b986 100644
--- a/shell/e-shell-utils.c
+++ b/shell/e-shell-utils.c
@@ -126,10 +126,16 @@ e_shell_folder_name_is_valid (const char *name,
if (strchr (name, E_PATH_SEPARATOR) != NULL) {
if (reason_return != NULL)
- *reason_return = _("Folder name cannot contain slashes.");
+ *reason_return = _("Folder name cannot contain the character \"/\".");
return FALSE;
}
-
+
+ if (strchr (name, '#') != NULL) {
+ if (reason_return != NULL)
+ *reason_return = _("Folder name cannot contain the character \"#\".");
+ return FALSE;
+ }
+
if (strcmp (name, ".") == 0 || strcmp (name, "..") == 0) {
if (reason_return != NULL)
*reason_return = _("'.' and '..' are reserved folder names.");