aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog6
-rw-r--r--shell/e-shell-folder-commands.c1
2 files changed, 7 insertions, 0 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 71b2101e58..99a746a444 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,11 @@
2001-08-22 Ettore Perazzoli <ettore@ximian.com>
+ * e-shell-folder-commands.c
+ (folder_selection_dialog_folder_selected_callback): Actually
+ return if the folder is being moved into one of its descendants.
+
+2001-08-22 Ettore Perazzoli <ettore@ximian.com>
+
* e-shell-folder-title-bar.c (label_realize_callback): `#if 0'ed
out.
(make_bold): Likewise.
diff --git a/shell/e-shell-folder-commands.c b/shell/e-shell-folder-commands.c
index afc775a5ab..e0472c6a73 100644
--- a/shell/e-shell-folder-commands.c
+++ b/shell/e-shell-folder-commands.c
@@ -188,6 +188,7 @@ folder_selection_dialog_folder_selected_callback (EShellFolderSelectionDialog *f
source_len) == 0) {
e_notice (GTK_WINDOW (folder_selection_dialog), GNOME_MESSAGE_BOX_ERROR,
_("Cannot move a folder into one of its descendants."));
+ return;
}
}