summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Wehner <martin.wehner@gmail.com>2006-08-04 21:50:25 +0000
committerMartin Wehner <mwehner@src.gnome.org>2006-08-04 21:50:25 +0000
commitb778c61e178d65fcf406aee7013446285c2d11db (patch)
tree442eaed61189039af77add0f59dc8f3ffee6169b
parent8973570e78924344c5a39c3b5fe0f47b9c0e98e4 (diff)
downloadnautilus-b778c61e178d65fcf406aee7013446285c2d11db.tar.gz
Revert patch from #336051 as it breaks the file update machinery. Fixes
2006-08-04 Martin Wehner <martin.wehner@gmail.com> * libnautilus-private/nautilus-directory-async.c: (dequeue_pending_idle_callback): Revert patch from #336051 as it breaks the file update machinery. Fixes #348097.
-rw-r--r--ChangeLog6
-rw-r--r--libnautilus-private/nautilus-directory-async.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b52992e2c..7d0e20c88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-04 Martin Wehner <martin.wehner@gmail.com>
+
+ * libnautilus-private/nautilus-directory-async.c:
+ (dequeue_pending_idle_callback): Revert patch from #336051
+ as it breaks the file update machinery. Fixes #348097.
+
2006-07-25 Christian Neumair <chris@gnome-de.org>
* libnautilus-private/nautilus-dnd.c:
diff --git a/libnautilus-private/nautilus-directory-async.c b/libnautilus-private/nautilus-directory-async.c
index 2d348d392..8290b8549 100644
--- a/libnautilus-private/nautilus-directory-async.c
+++ b/libnautilus-private/nautilus-directory-async.c
@@ -862,12 +862,13 @@ 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