AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-28 06:21:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'wip/otte/for-master' into 'master'

Browse Source 
Wip/otte/for master

See merge request GNOME/gtk!2277
This commit is contained in:
Benjamin Otte 2020-07-23 14:34:33 +00:00
commit 603dd72b09
4 changed files with 2 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gtk/gtksearchengine.c
View File

@ -178,8 +178,6 @@ static void
_gtk_search_engine_init (GtkSearchEngine *engine)
{
engine->priv = _gtk_search_engine_get_instance_private (engine);
engine->priv->recursive = TRUE;
}
static void
@ -412,28 +410,6 @@ _gtk_search_engine_error (GtkSearchEngine *engine,
g_signal_emit (engine, signals[ERROR], 0, error_message);
}
void
_gtk_search_engine_set_recursive (GtkSearchEngine *engine,
gboolean recursive)
{
g_return_if_fail (GTK_IS_SEARCH_ENGINE (engine));
g_assert (!engine->priv->running);
engine->priv->recursive = recursive;
if (engine->priv->native)
_gtk_search_engine_set_recursive (engine->priv->native, recursive);
}
gboolean
_gtk_search_engine_get_recursive (GtkSearchEngine *engine)
{
g_return_val_if_fail (GTK_IS_SEARCH_ENGINE (engine), TRUE);
return engine->priv->recursive;
}
void
_gtk_search_engine_set_model (GtkSearchEngine *engine,
GtkFileSystemModel *model)

3
gtk/gtksearchengine.h
View File

@ -88,9 +88,6 @@ void _gtk_search_engine_finished (GtkSearchEngine *engine,
gboolean got_results);
void _gtk_search_engine_error (GtkSearchEngine *engine,
const gchar *error_message);
void _gtk_search_engine_set_recursive (GtkSearchEngine *engine,
gboolean recursive);
gboolean _gtk_search_engine_get_recursive (GtkSearchEngine *engine);
void _gtk_search_hit_free (GtkSearchHit *hit);
GtkSearchHit *_gtk_search_hit_dup (GtkSearchHit *hit);

3
gtk/gtksearchenginemodel.c
View File

@ -28,8 +28,6 @@
#include <string.h>
#define BATCH_SIZE 500
struct _GtkSearchEngineModel
{
GtkSearchEngine parent;
@ -37,7 +35,6 @@ struct _GtkSearchEngineModel
GtkFileSystemModel *model;
GtkQuery *query;
gboolean query_finished;
guint idle;
};

4
gtk/gtksearchenginetracker3.c
View File

@ -195,9 +195,9 @@ gtk_search_engine_tracker3_start (GtkSearchEngine *engine)
GtkSearchEngineTracker3 *tracker;
TrackerSparqlStatement *statement;
const gchar *search_text;
gboolean recursive;
gchar *match;
GFile *location;
gboolean recursive;
tracker = GTK_SEARCH_ENGINE_TRACKER3 (engine);
@ -216,7 +216,7 @@ gtk_search_engine_tracker3_start (GtkSearchEngine *engine)
tracker->query_pending = TRUE;
search_text = gtk_query_get_text (tracker->query);
location = gtk_query_get_location (tracker->query);
recursive = _gtk_search_engine_get_recursive (engine);
recursive = TRUE;
if (location)
{