diff options
| author | Alexander Larsson <alexl@redhat.com> | 2007-07-23 14:08:55 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2007-07-23 14:08:55 +0000 |
| commit | 3e82bc94a695df8cc40de48369575bab359310e5 (patch) | |
| tree | 6d4bfb12aff351f3a94b9e6e2c215185997975ca | |
| parent | 7d760ac5a18fd2ef8b085bedb47d89af0fc9f377 (diff) | |
| download | nautilus-3e82bc94a695df8cc40de48369575bab359310e5.tar.gz | |
Don't error out when recursing into directories during search. (#433105)
2007-07-23 Alexander Larsson <alexl@redhat.com>
* libnautilus-private/nautilus-search-engine-simple.c:
Don't error out when recursing into directories during search. (#433105)
Requires recent gnome-vfs
Patch from Marlon Nelson
svn path=/trunk/; revision=13010
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-search-engine-simple.c | 8 |
2 files changed, 13 insertions, 2 deletions
@@ -1,3 +1,10 @@ +2007-07-23 Alexander Larsson <alexl@redhat.com> + + * libnautilus-private/nautilus-search-engine-simple.c: + Don't error out when recursing into directories during search. (#433105) + Requires recent gnome-vfs + Patch from Marlon Nelson + 2007-07-21 Martin Wehner <martin.wehner@gmail.com> * configure.in: diff --git a/libnautilus-private/nautilus-search-engine-simple.c b/libnautilus-private/nautilus-search-engine-simple.c index 83ebfb606..5765399ad 100644 --- a/libnautilus-private/nautilus-search-engine-simple.c +++ b/libnautilus-private/nautilus-search-engine-simple.c @@ -263,12 +263,16 @@ search_thread_func (gpointer user_data) { SearchThreadData *data; GnomeVFSResult res; + GnomeVFSDirectoryVisitOptions visit_options; data = user_data; + visit_options = GNOME_VFS_DIRECTORY_VISIT_LOOPCHECK | + GNOME_VFS_DIRECTORY_VISIT_IGNORE_RECURSE_ERROR; + res = gnome_vfs_directory_visit_uri (data->uri, - GNOME_VFS_FILE_INFO_GET_MIME_TYPE | GNOME_VFS_FILE_INFO_FOLLOW_LINKS, - GNOME_VFS_DIRECTORY_VISIT_LOOPCHECK, + GNOME_VFS_FILE_INFO_GET_MIME_TYPE, + visit_options, search_visit_func, data); send_batch (data); |