[nautilus/wip/csoriano/search-popover: 5/8] search: rename recursive to local and remote
- From: Carlos Soriano Sánchez <csoriano src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus/wip/csoriano/search-popover: 5/8] search: rename recursive to local and remote
- Date: Tue, 2 Feb 2016 21:29:50 +0000 (UTC)
commit 638ac4a001efb0413122b43a9a402a9eb35a9a47
Author: Carlos Soriano <csoriano gnome org>
Date: Tue Feb 2 21:21:47 2016 +0100
search: rename recursive to local and remote
For clarity.
data/org.gnome.nautilus.gschema.xml | 8 ++++----
.../nautilus-search-engine-tracker.c | 2 +-
src/nautilus-query-editor.c | 8 ++++----
src/nautilus-search-popover.c | 4 ++--
4 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/data/org.gnome.nautilus.gschema.xml b/data/org.gnome.nautilus.gschema.xml
index d91b79e..4a86028 100644
--- a/data/org.gnome.nautilus.gschema.xml
+++ b/data/org.gnome.nautilus.gschema.xml
@@ -76,12 +76,12 @@
<summary>Always use the location entry, instead of the pathbar</summary>
<description>If set to true, then Nautilus browser windows will always use a textual input entry for
the location toolbar, instead of the pathbar.</description>
</key>
- <key type="b" name="enable-recursive-search">
+ <key type="b" name="local-recursive-search">
<default>true</default>
- <summary>Whether to enable recursive search or not</summary>
- <description>Enables or disables recursive search in Nautilus.</description>
+ <summary>Whether to enable local recursive search or not</summary>
+ <description>Enables or disables local recursive search in Nautilus.</description>
</key>
- <key type="b" name="enable-remote-recursive-search">
+ <key type="b" name="remote-recursive-search">
<default>false</default>
<summary>Whether to enable recursive search or not on remote locations</summary>
<description>Enables or disables recursive search on remote locations in Nautilus.</description>
diff --git a/libnautilus-private/nautilus-search-engine-tracker.c
b/libnautilus-private/nautilus-search-engine-tracker.c
index 5a71600..f0fd9c1 100644
--- a/libnautilus-private/nautilus-search-engine-tracker.c
+++ b/libnautilus-private/nautilus-search-engine-tracker.c
@@ -282,7 +282,7 @@ nautilus_search_engine_tracker_start (NautilusSearchProvider *provider)
return;
}
- recursive = g_settings_get_boolean (nautilus_preferences, "enable-recursive-search");
+ recursive = g_settings_get_boolean (nautilus_preferences, "local-recursive-search");
tracker->details->recursive = recursive;
query_text = nautilus_query_get_text (tracker->details->query);
diff --git a/src/nautilus-query-editor.c b/src/nautilus-query-editor.c
index 1b34503..e2b5bd0 100644
--- a/src/nautilus-query-editor.c
+++ b/src/nautilus-query-editor.c
@@ -78,7 +78,7 @@ query_recursive_changed (GObject *object,
gchar *key;
priv = nautilus_query_editor_get_instance_private (editor);
- key = "enable-recursive-search";
+ key = "local-recursive-search";
if (priv->location) {
NautilusFile *file;
@@ -86,7 +86,7 @@ query_recursive_changed (GObject *object,
file = nautilus_file_get (priv->location);
if (nautilus_file_is_remote (file)) {
- key = "enable-remote-recursive-search";
+ key = "remote-recursive-search";
}
nautilus_file_unref (file);
@@ -275,10 +275,10 @@ create_query (NautilusQueryEditor *editor)
if (nautilus_file_is_remote (file)) {
recursive = g_settings_get_boolean (nautilus_preferences,
- "enable-remote-recursive-search");
+ "remote-recursive-search");
} else {
recursive = g_settings_get_boolean (nautilus_preferences,
- "enable-recursive-search");
+ "local-recursive-search");
}
nautilus_query_set_text (query, gtk_entry_get_text (GTK_ENTRY (priv->entry)));
diff --git a/src/nautilus-search-popover.c b/src/nautilus-search-popover.c
index 441fada..a608a2f 100644
--- a/src/nautilus-search-popover.c
+++ b/src/nautilus-search-popover.c
@@ -298,12 +298,12 @@ update_recursive_switch (NautilusSearchPopover *popover,
if (!nautilus_file_is_local (file))
{
active = g_settings_get_boolean (nautilus_preferences,
- "enable-remote-recursive-search");
+ "remote-recursive-search");
}
else
{
active = g_settings_get_boolean (nautilus_preferences,
- "enable-recursive-search");
+ "local-recursive-search");
}
gtk_switch_set_active (GTK_SWITCH (popover->recursive_switch), active);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]