diff options
| author | Robin * Slomkowski <rslomkow@eazel.com> | 2000-08-10 02:16:30 +0000 |
|---|---|---|
| committer | Robin Slomkowski <rslomkow@src.gnome.org> | 2000-08-10 02:16:30 +0000 |
| commit | c01cc515d7d797fedf4c3b335d082137c7f79eaf (patch) | |
| tree | 1d1983b9f65eda23628139341bf83610b07191be | |
| parent | c1ff9309cd30ff643a0b8cd2f07b7dc4cf15d9b4 (diff) | |
| download | nautilus-c01cc515d7d797fedf4c3b335d082137c7f79eaf.tar.gz | |
brought Darins fix in from the head for non-persistant data info
2000-08-09 Robin * Slomkowski <rslomkow@eazel.com>
* libnautilus-extensions/nautilus-directory-async.c:
(metafile_read_failed), (new_files_callback): brought
Darins fix in from the head for non-persistant data info
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | libnautilus-extensions/nautilus-directory-async.c | 7 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-directory-async.c | 7 |
3 files changed, 16 insertions, 4 deletions
@@ -1,5 +1,11 @@ 2000-08-09 Robin * Slomkowski <rslomkow@eazel.com> + * libnautilus-extensions/nautilus-directory-async.c: + (metafile_read_failed), (new_files_callback): brought + Darins fix in from the head for non-persistant data info + +2000-08-09 Robin * Slomkowski <rslomkow@eazel.com> + * components/Makefile.am: re-order since rpmview is dependent on services. * po/POTFILES.ignore: added generated glade files diff --git a/libnautilus-extensions/nautilus-directory-async.c b/libnautilus-extensions/nautilus-directory-async.c index a66344ffe..dee802672 100644 --- a/libnautilus-extensions/nautilus-directory-async.c +++ b/libnautilus-extensions/nautilus-directory-async.c @@ -301,7 +301,7 @@ metafile_read_failed (NautilusDirectory *directory) */ /* First, check if we already know if it a directory. */ - file = nautilus_file_get_existing (directory->details->uri_text); + file = nautilus_file_get (directory->details->uri_text); if (file == NULL || file->details->is_gone) { need_directory_check = FALSE; is_directory = FALSE; @@ -1266,7 +1266,10 @@ new_files_callback (GnomeVFSAsyncHandle *handle, /* Queue up the new files. */ for (p = results; p != NULL; p = p->next) { result = p->data; - directory_load_one (directory, result->file_info); + + if (result->result == GNOME_VFS_OK) { + directory_load_one (directory, result->file_info); + } } } diff --git a/libnautilus-private/nautilus-directory-async.c b/libnautilus-private/nautilus-directory-async.c index a66344ffe..dee802672 100644 --- a/libnautilus-private/nautilus-directory-async.c +++ b/libnautilus-private/nautilus-directory-async.c @@ -301,7 +301,7 @@ metafile_read_failed (NautilusDirectory *directory) */ /* First, check if we already know if it a directory. */ - file = nautilus_file_get_existing (directory->details->uri_text); + file = nautilus_file_get (directory->details->uri_text); if (file == NULL || file->details->is_gone) { need_directory_check = FALSE; is_directory = FALSE; @@ -1266,7 +1266,10 @@ new_files_callback (GnomeVFSAsyncHandle *handle, /* Queue up the new files. */ for (p = results; p != NULL; p = p->next) { result = p->data; - directory_load_one (directory, result->file_info); + + if (result->result == GNOME_VFS_OK) { + directory_load_one (directory, result->file_info); + } } } |