summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2007-03-19 16:46:27 +0000
committerAlexander Larsson <alexl@src.gnome.org>2007-03-19 16:46:27 +0000
commitaac502ba5842eb6d67cf42990760421928f7f0b9 (patch)
tree128cbce930fb7851e5fd2959b4485806c055b64c
parent71af40e3f5a2d90e3740c50cf98c9a5541d4abe3 (diff)
downloadnautilus-aac502ba5842eb6d67cf42990760421928f7f0b9.tar.gz
Avoid recursion when updating symlinks (#418771)
2007-03-19 Alexander Larsson <alexl@redhat.com> * libnautilus-private/nautilus-file.c (nautilus_file_emit_changed): Avoid recursion when updating symlinks (#418771) svn path=/branches/gnome-2-18/; revision=12829
-rw-r--r--ChangeLog7
-rw-r--r--libnautilus-private/nautilus-file.c4
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c416bc89d..afc05d07e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,11 @@
2007-03-19 Alexander Larsson <alexl@redhat.com>
+
+ * libnautilus-private/nautilus-file.c (nautilus_file_emit_changed):
+ Avoid recursion when updating symlinks (#418771)
+
+==== gnome-2-18 branched from here ===
+
+2007-03-19 Alexander Larsson <alexl@redhat.com>
* src/nautilus-places-sidebar.c:
Revert previous checkin since it broke the freeze.
diff --git a/libnautilus-private/nautilus-file.c b/libnautilus-private/nautilus-file.c
index af3a8fa71..2e0073df7 100644
--- a/libnautilus-private/nautilus-file.c
+++ b/libnautilus-private/nautilus-file.c
@@ -5487,7 +5487,9 @@ nautilus_file_emit_changed (NautilusFile *file)
/* Tell link files pointing to this object about the change. */
link_files = get_link_files (file);
for (p = link_files; p != NULL; p = p->next) {
- nautilus_file_changed (NAUTILUS_FILE (p->data));
+ if (p->data != file) {
+ nautilus_file_changed (NAUTILUS_FILE (p->data));
+ }
}
nautilus_file_list_free (link_files);
}