Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[GtkSearchEngineQuartz] Resolve the path to a GtkFile* for the hit list.

Browse Source 
Instead of a char* path, which the search_hit parser doesn't expect,
causing a crash.

Closes: $https://gitlab.gnome.org/GNOME/gtk/issues/815
This commit is contained in:
Daniel Boles
2019-01-06 15:56:57 -08:00
committed by John Ralls
parent 70b7b89411
commit ae8be92437
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
gtk/gtksearchenginequartz.c
View File

@@ -78,23 +78,31 @@ G_DEFINE_TYPE_WITH_PRIVATE (GtkSearchEngineQuartz, _gtk_search_engine_quartz, GT
for (i = submitted_hits; i < [ns_query resultCount]; i++)
{
id result = [ns_query resultAtIndex:i];
char *result_path;
const char *result_path;
GFile *file;
GtkSearchHit *hit;
result_path = g_strdup_printf ("file://%s", [[result valueForAttribute:@"kMDItemPath"] cString]);
hits = g_list_prepend (hits, result_path);
result_path = [[result valueForAttribute:@"kMDItemPath"] UTF8String];
file = g_file_new_for_path (result_path);
hit = g_new (GtkSearchHit, 1);
hit->file = file;
hit->info = NULL;
hits = g_list_prepend (hits, hit);
}
_gtk_search_engine_hits_added (engine, hits);
g_list_free (hits);
g_list_free_full (hits, (GDestroyNotify) _gtk_search_hit_free);
submitted_hits = [ns_query resultCount];
submitted_hits += [ns_query resultCount];
/* The beagle backend stops at 1000 hits, so guess we do so too here.
* It works pretty snappy on my MacBook, if we get rid of this limit
* we are almost definitely going to need some code to submit hits
* in batches.
*/
if (submitted_hits > 1000)
if (submitted_hits > 25)
[ns_query stopQuery];
}