AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Port to GtkSearchHit

Browse Source 
GtkSearchEngineModel was still trying to return uris as hits.
This is not working anymore, we are expected to return GtkSearchHit
structs.
This commit is contained in:
Matthias Clasen 2015-07-24 15:41:45 -04:00
parent 48c172f4e0
commit 1069e2b9cc
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
gtk/gtksearchenginemodel.c
View File

@ -90,23 +90,26 @@ do_search (gpointer data)
do
{
GFileInfo *info;
GFile *file;
gchar *uri;
info = _gtk_file_system_model_get_info (model->model, &iter);
if (info_matches_query (model->query, info))
{
GFile *file;
GtkSearchHit *hit;
file = _gtk_file_system_model_get_file (model->model, &iter);
uri = g_file_get_uri (file);
hits = g_list_prepend (hits, uri);
hit = g_new (GtkSearchHit, 1);
hit->uri = g_file_get_uri (file);
hit->info = g_object_ref (info);
hits = g_list_prepend (hits, hit);
}
}
while (gtk_tree_model_iter_next (GTK_TREE_MODEL (model->model), &iter));
}
while (gtk_tree_model_iter_next (GTK_TREE_MODEL (model->model), &iter));
if (hits)
{
_gtk_search_engine_hits_added (GTK_SEARCH_ENGINE (model), hits);
g_list_free_full (hits, g_free);
g_list_free_full (hits, (GDestroyNotify)_gtk_search_hit_free);
}
}
@ -144,19 +147,11 @@ gtk_search_engine_model_stop (GtkSearchEngine *engine)
static void
gtk_search_engine_model_set_query (GtkSearchEngine *engine,
GtkQuery *query)
GtkQuery *query)
{
GtkSearchEngineModel *model;
GtkSearchEngineModel *model = GTK_SEARCH_ENGINE_MODEL (engine);
model = GTK_SEARCH_ENGINE_MODEL (engine);
if (query)
g_object_ref (query);
if (model->query)
g_object_unref (model->query);
model->query = query;
g_set_object (&model->query, query);
}
static void