diff options
| author | Martin Wehner <martin.wehner@gmail.com> | 2006-07-11 01:55:30 +0000 |
|---|---|---|
| committer | Martin Wehner <mwehner@src.gnome.org> | 2006-07-11 01:55:30 +0000 |
| commit | b7e69e709d26fc3a36a4b5ed4d2e6556fe69483d (patch) | |
| tree | f9af61a251d85fe002090cf2d092442b331baf34 | |
| parent | 293e7cd0ef01b01dcd93f3602c48407a923575c7 (diff) | |
| download | nautilus-b7e69e709d26fc3a36a4b5ed4d2e6556fe69483d.tar.gz | |
Never add a file to both the added_files and changed_files lists. Don't
2006-07-11 Martin Wehner <martin.wehner@gmail.com>
* libnautilus-private/nautilus-directory-async.c:
(dequeue_pending_idle_callback): Never add a file to both
the added_files and changed_files lists. Don't ref an existing
file without adding it to the changed_file list. (#336051)
Patch from Christian Neumair <chris@gnome-de.org>
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-directory-async.c | 3 |
2 files changed, 10 insertions, 2 deletions
@@ -1,5 +1,14 @@ 2006-07-11 Martin Wehner <martin.wehner@gmail.com> + * libnautilus-private/nautilus-directory-async.c: + (dequeue_pending_idle_callback): Never add a file to both + the added_files and changed_files lists. Don't ref an existing + file without adding it to the changed_file list. (#336051) + + Patch from Christian Neumair <chris@gnome-de.org> + +2006-07-11 Martin Wehner <martin.wehner@gmail.com> + * libnautilus-private/nautilus-file-dnd.[ch]: Add functions nautilus_drag_can_accept_files and nautilus_drag_can_accept_info. diff --git a/libnautilus-private/nautilus-directory-async.c b/libnautilus-private/nautilus-directory-async.c index 8290b8549..2d348d392 100644 --- a/libnautilus-private/nautilus-directory-async.c +++ b/libnautilus-private/nautilus-directory-async.c @@ -862,13 +862,12 @@ dequeue_pending_idle_callback (gpointer callback_data) nautilus_file_ref (file); changed_files = g_list_prepend (changed_files, file); } - nautilus_file_ref (file); } else { /* new file, create a nautilus file object and add it to the list */ file = nautilus_file_new_from_info (directory, file_info); nautilus_directory_add_file (directory, file); + added_files = g_list_prepend (added_files, file); } - added_files = g_list_prepend (added_files, file); } /* If we are done loading, then we assume that any unconfirmed |