[nautilus] properties-window: Remove computer:/// handling
- From: Carlos Soriano <csoriano src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus] properties-window: Remove computer:/// handling
- Date: Wed, 9 May 2018 14:52:59 +0000 (UTC)
commit c79aff62ab9ff78f78695d6c5ed61f11c33ac4fb
Author: Carlos Soriano <csoriano gnome org>
Date: Wed May 9 16:41:36 2018 +0200
properties-window: Remove computer:/// handling
We don't use it anywhere else and gvfs is considering dropping it.
So let's remove it to allow gvfs go forward with its removal.
See: https://gitlab.gnome.org/GNOME/nautilus/issues/376
src/nautilus-properties-window.c | 23 ++---------------------
src/nautilus-query-editor.c | 4 ----
2 files changed, 2 insertions(+), 25 deletions(-)
---
diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c
index e16e768c9..ceac358d0 100644
--- a/src/nautilus-properties-window.c
+++ b/src/nautilus-properties-window.c
@@ -2571,19 +2571,6 @@ create_grid_with_standard_properties (void)
return grid;
}
-static gboolean
-is_computer_directory (NautilusFile *file)
-{
- char *file_uri;
- gboolean result;
-
- file_uri = nautilus_file_get_uri (file);
- result = strcmp (file_uri, "computer:///") == 0;
- g_free (file_uri);
-
- return result;
-}
-
static gboolean
is_root_directory (NautilusFile *file)
{
@@ -2639,7 +2626,6 @@ should_show_file_type (NautilusPropertiesWindow *window)
{
if (!is_multi_file_window (window)
&& (nautilus_file_is_in_trash (get_target_file (window)) ||
- is_computer_directory (get_target_file (window)) ||
is_network_directory (get_target_file (window)) ||
is_burn_directory (get_target_file (window))))
{
@@ -2656,7 +2642,6 @@ should_show_location_info (NautilusPropertiesWindow *window)
if (!is_multi_file_window (window)
&& (nautilus_file_is_in_trash (get_target_file (window)) ||
is_root_directory (get_target_file (window)) ||
- is_computer_directory (get_target_file (window)) ||
is_network_directory (get_target_file (window)) ||
is_burn_directory (get_target_file (window))))
{
@@ -2709,7 +2694,6 @@ should_show_free_space (NautilusPropertiesWindow *window)
{
if (!is_multi_file_window (window)
&& (nautilus_file_is_in_trash (get_target_file (window)) ||
- is_computer_directory (get_target_file (window)) ||
is_network_directory (get_target_file (window)) ||
nautilus_file_is_in_recent (get_target_file (window)) ||
is_burn_directory (get_target_file (window))))
@@ -4790,8 +4774,7 @@ should_show_permissions (NautilusPropertiesWindow *window)
*/
if (!is_multi_file_window (window)
&& (nautilus_file_is_in_trash (file) ||
- nautilus_file_is_in_recent (file) ||
- is_computer_directory (file)))
+ nautilus_file_is_in_recent (file)))
{
return FALSE;
}
@@ -4888,9 +4871,7 @@ is_a_special_file (NautilusFile *file)
{
gboolean is_special;
- is_special = file == NULL ||
- nautilus_file_is_in_trash (file) ||
- is_computer_directory (file);
+ is_special = file == NULL || nautilus_file_is_in_trash (file) ||
return is_special;
}
diff --git a/src/nautilus-query-editor.c b/src/nautilus-query-editor.c
index 9c8033def..a5dfd9a62 100644
--- a/src/nautilus-query-editor.c
+++ b/src/nautilus-query-editor.c
@@ -134,10 +134,6 @@ update_information_label (NautilusQueryEditor *editor)
label = _("Searching locations only");
fts_sensitive = FALSE;
}
- else if (g_str_has_prefix (uri, "computer://"))
- {
- label = _("Searching devices only");
- }
else if (g_str_has_prefix (uri, "network://"))
{
label = _("Searching network locations only");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]