[nautilus] search-directory: make the simple engine recursive



commit 6a1cdcf6a68ed4f63890bf3a3ac2a0cca121321e
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Thu Oct 18 17:16:41 2012 -0400

    search-directory: make the simple engine recursive
    
    https://bugzilla.gnome.org/show_bug.cgi?id=325146

 libnautilus-private/nautilus-search-directory.c    |    4 ++++
 .../nautilus-search-engine-simple.h                |    2 --
 libnautilus-private/nautilus-search-engine.c       |    6 ++++++
 libnautilus-private/nautilus-search-engine.h       |    3 +++
 4 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/libnautilus-private/nautilus-search-directory.c b/libnautilus-private/nautilus-search-directory.c
index 510d319..06901b6 100644
--- a/libnautilus-private/nautilus-search-directory.c
+++ b/libnautilus-private/nautilus-search-directory.c
@@ -145,6 +145,7 @@ static void
 start_search (NautilusSearchDirectory *search)
 {
 	NautilusSearchEngineModel *model_provider;
+	NautilusSearchEngineSimple *simple_provider;
 
 	if (!search->details->query) {
 		return;
@@ -169,6 +170,9 @@ start_search (NautilusSearchDirectory *search)
 	model_provider = nautilus_search_engine_get_model_provider (search->details->engine);
 	nautilus_search_engine_model_set_model (model_provider, search->details->base_model);
 
+	simple_provider = nautilus_search_engine_get_simple_provider (search->details->engine);
+	g_object_set (simple_provider, "recursive", TRUE, NULL);
+
 	reset_file_list (search);
 
 	nautilus_search_provider_start (NAUTILUS_SEARCH_PROVIDER (search->details->engine));
diff --git a/libnautilus-private/nautilus-search-engine-simple.h b/libnautilus-private/nautilus-search-engine-simple.h
index bd11197..93f491e 100644
--- a/libnautilus-private/nautilus-search-engine-simple.h
+++ b/libnautilus-private/nautilus-search-engine-simple.h
@@ -24,8 +24,6 @@
 #ifndef NAUTILUS_SEARCH_ENGINE_SIMPLE_H
 #define NAUTILUS_SEARCH_ENGINE_SIMPLE_H
 
-#include <libnautilus-private/nautilus-search-engine.h>
-
 #define NAUTILUS_TYPE_SEARCH_ENGINE_SIMPLE		(nautilus_search_engine_simple_get_type ())
 #define NAUTILUS_SEARCH_ENGINE_SIMPLE(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), NAUTILUS_TYPE_SEARCH_ENGINE_SIMPLE, NautilusSearchEngineSimple))
 #define NAUTILUS_SEARCH_ENGINE_SIMPLE_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_SEARCH_ENGINE_SIMPLE, NautilusSearchEngineSimpleClass))
diff --git a/libnautilus-private/nautilus-search-engine.c b/libnautilus-private/nautilus-search-engine.c
index c92b745..31fa941 100644
--- a/libnautilus-private/nautilus-search-engine.c
+++ b/libnautilus-private/nautilus-search-engine.c
@@ -313,3 +313,9 @@ nautilus_search_engine_get_model_provider (NautilusSearchEngine *engine)
 {
 	return engine->details->model;
 }
+
+NautilusSearchEngineSimple *
+nautilus_search_engine_get_simple_provider (NautilusSearchEngine *engine)
+{
+	return engine->details->simple;
+}
diff --git a/libnautilus-private/nautilus-search-engine.h b/libnautilus-private/nautilus-search-engine.h
index b9cefad..916dbdd 100644
--- a/libnautilus-private/nautilus-search-engine.h
+++ b/libnautilus-private/nautilus-search-engine.h
@@ -28,6 +28,7 @@
 
 #include <libnautilus-private/nautilus-directory.h>
 #include <libnautilus-private/nautilus-search-engine-model.h>
+#include <libnautilus-private/nautilus-search-engine-simple.h>
 
 #define NAUTILUS_TYPE_SEARCH_ENGINE		(nautilus_search_engine_get_type ())
 #define NAUTILUS_SEARCH_ENGINE(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), NAUTILUS_TYPE_SEARCH_ENGINE, NautilusSearchEngine))
@@ -52,5 +53,7 @@ GType                 nautilus_search_engine_get_type           (void);
 NautilusSearchEngine *nautilus_search_engine_new                (void);
 NautilusSearchEngineModel *
                       nautilus_search_engine_get_model_provider (NautilusSearchEngine *engine);
+NautilusSearchEngineSimple *
+                      nautilus_search_engine_get_simple_provider (NautilusSearchEngine *engine);
 
 #endif /* NAUTILUS_SEARCH_ENGINE_H */



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]