diff options
| author | Alexander Larsson <alexl@redhat.com> | 2005-05-16 15:11:31 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2005-05-16 15:11:31 +0000 |
| commit | d99b191ff097c258a0c0d3c952ae25a455308c59 (patch) | |
| tree | 6a8049fb0c2d8c686702f7bc7e7bd5caa9a4c135 | |
| parent | afffabfe2f65520262b3bcce348d9e524b3b5c8e (diff) | |
| download | nautilus-d99b191ff097c258a0c0d3c952ae25a455308c59.tar.gz | |
Don't loop when a bookmarked file is removed
2005-05-16 Alexander Larsson <alexl@redhat.com>
* libnautilus-private/nautilus-bookmark.c:
(bookmark_file_changed_callback):
Don't loop when a bookmarked file is removed
* src/file-manager/fm-directory-view.c: (process_new_files):
Don't call get_file_info for files no longer in the directory
(was caused by the ready_to_load call).
This fixes #165530 and likely #170761
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-bookmark.c | 1 | ||||
| -rw-r--r-- | src/file-manager/fm-directory-view.c | 2 |
3 files changed, 13 insertions, 2 deletions
@@ -1,3 +1,15 @@ +2005-05-16 Alexander Larsson <alexl@redhat.com> + + * libnautilus-private/nautilus-bookmark.c: + (bookmark_file_changed_callback): + Don't loop when a bookmarked file is removed + + * src/file-manager/fm-directory-view.c: (process_new_files): + Don't call get_file_info for files no longer in the directory + (was caused by the ready_to_load call). + + This fixes #165530 and likely #170761 + 2005-05-12 Christian Neumair <chris@gnome-de.org> * libnautilus-private/nautilus-clipboard.c: diff --git a/libnautilus-private/nautilus-bookmark.c b/libnautilus-private/nautilus-bookmark.c index 3a8950c1b..3335453c2 100644 --- a/libnautilus-private/nautilus-bookmark.c +++ b/libnautilus-private/nautilus-bookmark.c @@ -351,7 +351,6 @@ bookmark_file_changed_callback (NautilusFile *file, NautilusBookmark *bookmark) * we will notice. */ nautilus_bookmark_disconnect_file (bookmark); - nautilus_bookmark_connect_file (bookmark); should_emit_appearance_changed_signal = TRUE; } else if (nautilus_bookmark_update_icon (bookmark)) { /* File hasn't gone away, but it has changed diff --git a/src/file-manager/fm-directory-view.c b/src/file-manager/fm-directory-view.c index 20b03601f..2d0ecfb70 100644 --- a/src/file-manager/fm-directory-view.c +++ b/src/file-manager/fm-directory-view.c @@ -2310,7 +2310,7 @@ process_new_files (FMDirectoryView *view) */ for (node = new_changed_files; node != NULL; node = node->next) { file = NAUTILUS_FILE (node->data); - if (ready_to_load (file) || !still_should_show_file (view, file)) { + if (!still_should_show_file (view, file) || ready_to_load (file)) { if (g_hash_table_lookup (non_ready_files, file) != NULL) { g_hash_table_remove (non_ready_files, file); nautilus_file_unref (file); |