diff options
| -rw-r--r-- | eel/eel-vfs-extensions.c | 8 | ||||
| -rw-r--r-- | eel/eel-vfs-extensions.h | 1 | ||||
| -rw-r--r-- | src/nautilus-files-view.c | 2 |
3 files changed, 10 insertions, 1 deletions
diff --git a/eel/eel-vfs-extensions.c b/eel/eel-vfs-extensions.c index 382863ff9..afdf0621a 100644 --- a/eel/eel-vfs-extensions.c +++ b/eel/eel-vfs-extensions.c @@ -43,6 +43,8 @@ eel_uri_is_starred (const gchar *uri) return g_str_has_prefix (uri, "starred:"); } +/* It also matches trashed folders inside Trash, + * use `eel_uri_is_trash_root` if that's not desirable. */ gboolean eel_uri_is_trash (const char *uri) { @@ -50,6 +52,12 @@ eel_uri_is_trash (const char *uri) } gboolean +eel_uri_is_trash_root (const char *uri) +{ + return g_strcmp0 (uri, "trash:///") == 0; +} + +gboolean eel_uri_is_recent (const char *uri) { return g_str_has_prefix (uri, "recent:"); diff --git a/eel/eel-vfs-extensions.h b/eel/eel-vfs-extensions.h index b2687af26..b90fc696a 100644 --- a/eel/eel-vfs-extensions.h +++ b/eel/eel-vfs-extensions.h @@ -35,6 +35,7 @@ G_BEGIN_DECLS gboolean eel_uri_is_starred (const char *uri); gboolean eel_uri_is_trash (const char *uri); +gboolean eel_uri_is_trash_root (const char *uri); gboolean eel_uri_is_search (const char *uri); gboolean eel_uri_is_other_locations (const char *uri); gboolean eel_uri_is_recent (const char *uri); diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c index ab54906ea..427ac08c5 100644 --- a/src/nautilus-files-view.c +++ b/src/nautilus-files-view.c @@ -3628,7 +3628,7 @@ real_check_empty_states (NautilusFilesView *view) { gtk_widget_show (priv->no_search_results_widget); } - else if (eel_uri_is_trash (uri)) + else if (eel_uri_is_trash_root (uri)) { gtk_widget_show (priv->trash_is_empty_widget); } |