aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2002-09-24 04:07:30 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2002-09-24 04:07:30 +0800
commitb0b2ebe9c30f90226a3fb15d737d7c281df3e75b (patch)
treed2413a3d07621fa2577884296a85111eefa29e70
parentebe98873eae6891787be887f2ad4d6f37165afd4 (diff)
downloadgsoc2013-evolution-b0b2ebe9c30f90226a3fb15d737d7c281df3e75b.tar
gsoc2013-evolution-b0b2ebe9c30f90226a3fb15d737d7c281df3e75b.tar.gz
gsoc2013-evolution-b0b2ebe9c30f90226a3fb15d737d7c281df3e75b.tar.bz2
gsoc2013-evolution-b0b2ebe9c30f90226a3fb15d737d7c281df3e75b.tar.lz
gsoc2013-evolution-b0b2ebe9c30f90226a3fb15d737d7c281df3e75b.tar.xz
gsoc2013-evolution-b0b2ebe9c30f90226a3fb15d737d7c281df3e75b.tar.zst
gsoc2013-evolution-b0b2ebe9c30f90226a3fb15d737d7c281df3e75b.zip
(get_type_from_parent_path):
Return "mail" instead of NULL when we don't have a parent folder. [#28232] svn path=/trunk/; revision=18179
-rw-r--r--shell/ChangeLog6
-rw-r--r--shell/e-shell-folder-creation-dialog.c6
2 files changed, 9 insertions, 3 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 76a27544a1..8b299bf31c 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,11 @@
2002-09-23 Ettore Perazzoli <ettore@ximian.com>
+ * e-shell-folder-creation-dialog.c (get_type_from_parent_path):
+ Return "mail" instead of NULL when we don't have a parent folder.
+ [#28232]
+
+2002-09-23 Ettore Perazzoli <ettore@ximian.com>
+
* e-shell-about-box.c: Added some missing names.
* main.c (main): Declare --force-upgrade correctly so it works.
diff --git a/shell/e-shell-folder-creation-dialog.c b/shell/e-shell-folder-creation-dialog.c
index dc4ea94826..40688966ac 100644
--- a/shell/e-shell-folder-creation-dialog.c
+++ b/shell/e-shell-folder-creation-dialog.c
@@ -457,12 +457,12 @@ get_type_from_parent_path (EShell *shell,
set = e_shell_get_storage_set (shell);
folder = e_storage_set_get_folder (set, path);
if (folder == NULL) {
- return NULL;
+ return "mail";
}
folder_type = e_folder_get_type_string (folder);
- if (folder_type == NULL) {
- return NULL;
+ if (folder_type == NULL || strcmp (folder_type, "noselect") == 0) {
+ return "mail";
} else {
return folder_type;
}