callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'gtk-3-24' into 'gtk-3-24'

Browse Source 
GtkSearchEngineQuartz Fixes

See merge request GNOME/gtk!490
This commit is contained in:
Matthias Clasen
2019-01-07 20:24:48 +00:00
parent 7f2cb91761 ad9fd969de
commit 4fe28ba02a
1 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
gtk/gtksearchenginequartz.c
View File

@ -73,29 +73,37 @@ G_DEFINE_TYPE_WITH_PRIVATE (GtkSearchEngineQuartz, _gtk_search_engine_quartz, GT
{ {
int i; int i;
GList *hits = NULL; GList *hits = NULL;
/* The max was originally set to 1000 to mimic something called "the
* boogie backend".
*/
const unsigned int max_hits = 1000;
const unsigned int max_iter = submitted_hits + [ns_query resultCount];
/* Here we submit hits "submitted_hits" to "resultCount" */ /* Here we submit hits "submitted_hits" to "resultCount" */
for (i = submitted_hits; i < [ns_query resultCount]; i++) for (i = submitted_hits; i < max_iter && i < max_hits; ++i)
{ {
id result = [ns_query resultAtIndex: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]); result_path = [[result valueForAttribute:@"kMDItemPath"] UTF8String];
hits = g_list_prepend (hits, result_path); 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); _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]; if (max_iter >= max_hits)
/* 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)
[ns_query stopQuery]; [ns_query stopQuery];
submitted_hits = max_iter;
} }
- (void) queryUpdate:(id)sender - (void) queryUpdate:(id)sender