Assume Posix nftw behaviour

svn path=/trunk/; revision=17812
This commit is contained in:
Matthias Clasen 2007-05-10 15:04:51 +00:00
parent f795745019
commit 88283d7d6c
2 changed files with 8 additions and 5 deletions

View File

@ -1,3 +1,8 @@
2007-05-10 Matthias Clasen <mclasen@redhat.com>
* gtk/gtksearchenginesimple.c (search_visit_func);
Assume Posix nftw behaviour.
2007-05-09 Dom Lachowicz <domlachowicz@gmail.com> 2007-05-09 Dom Lachowicz <domlachowicz@gmail.com>
* modules/engines/ms-windows/Theme/gtk-2.0/gtkrc: GtkTreeView doesn't * modules/engines/ms-windows/Theme/gtk-2.0/gtkrc: GtkTreeView doesn't

View File

@ -193,7 +193,7 @@ search_visit_func (const char *fpath,
SearchThreadData *data; SearchThreadData *data;
gint i; gint i;
const gchar *name; const gchar *name;
gchar *lower_name, *path, *mime_type; gchar *lower_name, *mime_type;
gchar *uri; gchar *uri;
gboolean hit; gboolean hit;
GList *l; GList *l;
@ -210,8 +210,6 @@ search_visit_func (const char *fpath,
else else
name = fpath; name = fpath;
path = g_build_filename (data->path, fpath, NULL);
is_hidden = *name == '.'; is_hidden = *name == '.';
hit = FALSE; hit = FALSE;
@ -235,7 +233,7 @@ search_visit_func (const char *fpath,
if (hit && data->mime_types != NULL) if (hit && data->mime_types != NULL)
{ {
hit = FALSE; hit = FALSE;
mime_type = xdg_mime_get_mime_type_for_file (path, (struct stat *)sb); mime_type = xdg_mime_get_mime_type_for_file (fpath, (struct stat *)sb);
for (l = data->mime_types; l != NULL; l = l->next) for (l = data->mime_types; l != NULL; l = l->next)
{ {
if (strcmp (mime_type, l->data) == 0) if (strcmp (mime_type, l->data) == 0)
@ -250,7 +248,7 @@ search_visit_func (const char *fpath,
if (hit) if (hit)
{ {
uri = g_filename_to_uri (path, NULL, NULL); uri = g_filename_to_uri (fpath, NULL, NULL);
data->uri_hits = g_list_prepend (data->uri_hits, uri); data->uri_hits = g_list_prepend (data->uri_hits, uri);
} }