diff options
| author | Cosimo Cecchi <cosimoc@gnome.org> | 2015-05-28 11:20:48 -0700 |
|---|---|---|
| committer | Cosimo Cecchi <cosimoc@gnome.org> | 2015-05-28 11:20:48 -0700 |
| commit | 0fb580e5559d722290f5ded958ae00c34aabc7ec (patch) | |
| tree | 2b78d0eabea8b718624530bcf5150f22dd14e8c6 | |
| parent | 7313423e7cfea2fb004aab5355bb4aca0ed9823f (diff) | |
| download | nautilus-0fb580e5559d722290f5ded958ae00c34aabc7ec.tar.gz | |
search: use preferences singleton instead of creating new objects
| -rw-r--r-- | libnautilus-private/nautilus-search-directory.c | 3 | ||||
| -rw-r--r-- | libnautilus-private/nautilus-search-engine-tracker.c | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/libnautilus-private/nautilus-search-directory.c b/libnautilus-private/nautilus-search-directory.c index 281694f16..eb43d4e8c 100644 --- a/libnautilus-private/nautilus-search-directory.c +++ b/libnautilus-private/nautilus-search-directory.c @@ -26,6 +26,7 @@ #include "nautilus-file.h" #include "nautilus-file-private.h" #include "nautilus-file-utilities.h" +#include "nautilus-global-preferences.h" #include "nautilus-search-provider.h" #include "nautilus-search-engine.h" #include "nautilus-search-engine-model.h" @@ -142,7 +143,6 @@ start_search (NautilusSearchDirectory *search) { NautilusSearchEngineModel *model_provider; NautilusSearchEngineSimple *simple_provider; - GSettings *nautilus_preferences; gboolean recursive; if (!search->details->query) { @@ -169,7 +169,6 @@ start_search (NautilusSearchDirectory *search) nautilus_search_engine_model_set_model (model_provider, search->details->base_model); simple_provider = nautilus_search_engine_get_simple_provider (search->details->engine); - nautilus_preferences = g_settings_new ("org.gnome.nautilus.preferences"); recursive = g_settings_get_boolean (nautilus_preferences, "enable-recursive-search"); g_object_set (simple_provider, "recursive", recursive, NULL); diff --git a/libnautilus-private/nautilus-search-engine-tracker.c b/libnautilus-private/nautilus-search-engine-tracker.c index 0244d3b1b..1a841e9a6 100644 --- a/libnautilus-private/nautilus-search-engine-tracker.c +++ b/libnautilus-private/nautilus-search-engine-tracker.c @@ -21,12 +21,14 @@ */ #include <config.h> +#include "nautilus-search-engine-tracker.h" + +#include "nautilus-global-preferences.h" #include "nautilus-search-hit.h" #include "nautilus-search-provider.h" -#include "nautilus-search-engine-tracker.h" + #include <string.h> #include <gio/gio.h> - #include <libtracker-sparql/tracker-sparql.h> struct NautilusSearchEngineTrackerDetails { @@ -236,7 +238,6 @@ nautilus_search_engine_tracker_start (NautilusSearchProvider *provider) GString *sparql; GList *mimetypes, *l; gint mime_count; - GSettings *nautilus_preferences; gboolean recursive; tracker = NAUTILUS_SEARCH_ENGINE_TRACKER (provider); @@ -253,7 +254,6 @@ nautilus_search_engine_tracker_start (NautilusSearchProvider *provider) return; } - nautilus_preferences = g_settings_new ("org.gnome.nautilus.preferences"); recursive = g_settings_get_boolean (nautilus_preferences, "enable-recursive-search"); tracker->details->recursive = recursive; |