diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2003-03-07 03:32:46 +0800 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2003-03-07 03:32:46 +0800 |
| commit | 12cf52d717e51baa9c2ab5b376233e188bfb1ed3 (patch) | |
| tree | 2d60b3c4f5810dee46c59a5c6ce0c3e53041f32d | |
| parent | d039f69326f070a4ddb025f2ec72bb0461aecfed (diff) | |
| download | gsoc2013-evolution-12cf52d717e51baa9c2ab5b376233e188bfb1ed3.tar.gz gsoc2013-evolution-12cf52d717e51baa9c2ab5b376233e188bfb1ed3.tar.zst gsoc2013-evolution-12cf52d717e51baa9c2ab5b376233e188bfb1ed3.zip | |
(e_shell_folder_name_is_valid): Do not allow
names with a "#" in them either.
svn path=/trunk/; revision=20210
| -rw-r--r-- | shell/ChangeLog | 5 | ||||
| -rw-r--r-- | shell/e-shell-utils.c | 10 |
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."); |