Revert "Merge branch 'wip/oholy/trashing-locations' into 'master'"

This reverts merge request !49

4 files changed, 1 insertions, 133 deletions

diff --git a/gio/glocalfile.c b/gio/glocalfile.c
index aff15a982..3cd0137d6 100644
--- a/gio/glocalfile.c
+++ b/gio/glocalfile.c
@@ -1769,7 +1769,6 @@ _g_local_file_has_trash_dir (const char *dirname, dev_t dir_dev)
   char uid_str[32];
   GStatBuf global_stat, trash_stat;
   gboolean res;
-  GUnixMountEntry *mount;
 
   if (g_once_init_enter (&home_dev_set))
     {
@@ -1788,16 +1787,6 @@ _g_local_file_has_trash_dir (const char *dirname, dev_t dir_dev)
   if (topdir == NULL)
     return FALSE;
 
-  mount = g_unix_mount_at (topdir, NULL);
-  if (mount == NULL || g_unix_mount_is_system_internal (mount))
-    {
-      g_clear_pointer (&mount, g_unix_mount_free);
-
-      return FALSE;
-    }
-
-  g_clear_pointer (&mount, g_unix_mount_free);
-
   globaldir = g_build_filename (topdir, ".Trash", NULL);
   if (g_lstat (globaldir, &global_stat) == 0 &&
       S_ISDIR (global_stat.st_mode) &&
@@ -1941,7 +1930,6 @@ g_local_file_trash (GFile         *file,
     {
       uid_t uid;
       char uid_str[32];
-      GUnixMountEntry *mount;
 
       uid = geteuid ();
       g_snprintf (uid_str, sizeof (uid_str), "%lu", (unsigned long)uid);
@@ -1954,21 +1942,7 @@ g_local_file_trash (GFile         *file,
                           file, G_IO_ERROR_NOT_SUPPORTED);
 	  return FALSE;
 	}
-
-      mount = g_unix_mount_at (topdir, NULL);
-      if (mount == NULL || g_unix_mount_is_system_internal (mount))
-        {
-          g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
-                       _("Trashing on system internal mounts is not supported"));
-
-          g_clear_pointer (&mount, g_unix_mount_free);
-          g_free (topdir);
-
-          return FALSE;
-        }
-
-      g_clear_pointer (&mount, g_unix_mount_free);
-
+      
       /* Try looking for global trash dir $topdir/.Trash/$uid */
       globaldir = g_build_filename (topdir, ".Trash", NULL);
       if (g_lstat (globaldir, &global_stat) == 0 &&
diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am
index 599823893..410f11d95 100644
--- a/gio/tests/Makefile.am
+++ b/gio/tests/Makefile.am
@@ -273,7 +273,6 @@ test_programs += \
 	unix-mounts				\
 	unix-streams				\
 	g-file-info-filesystem-readonly		\
-	trash					\
 	$(NULL)
 
 test_extra_programs += \
diff --git a/gio/tests/meson.build b/gio/tests/meson.build
index 83fadb6d7..96229bd8b 100644
--- a/gio/tests/meson.build
+++ b/gio/tests/meson.build
@@ -123,7 +123,6 @@ if host_machine.system() != 'windows'
     'unix-streams',
     'g-file-info-filesystem-readonly',
     'gschema-compile',
-    'trash',
   ]
 
   # Uninstalled because of the check-for-executable logic in DesktopAppInfo
diff --git a/gio/tests/trash.c b/gio/tests/trash.c
deleted file mode 100644
index f8fea56ae..000000000
--- a/gio/tests/trash.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (C) 2018 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of the
- * licence, or (at your option) any later version.
- *
- * This is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <glib.h>
-
-#ifndef G_OS_UNIX
-#error This is a Unix-specific test
-#endif
-
-#include <glib/gstdio.h>
-#include <gio/gio.h>
-#include <gio/gunixmounts.h>
-
-/* Test that g_file_trash() returns G_IO_ERROR_NOT_SUPPORTED for files on system mounts. */
-static void
-test_trash_not_supported (void)
-{
-  GFile *file;
-  GFileIOStream *stream;
-  GUnixMountEntry *mount;
-  GFileInfo *info;
-  GError *error = NULL;
-  gboolean ret;
-  GStatBuf file_stat, home_stat;
-
-  /* The test assumes that tmp file is located on system internal mount. */
-  file = g_file_new_tmp ("test-trashXXXXXX", &stream, &error);
-  g_assert_no_error (error);
-  g_assert_cmpint (g_lstat (g_file_peek_path (file), &file_stat), ==, 0);
-  g_test_message ("File: %s (dev: %lu)", g_file_peek_path (file), file_stat.st_dev);
-
-  g_assert_cmpint (g_stat (g_get_home_dir (), &home_stat), ==, 0);
-  g_test_message ("Home: %s (dev: %lu)", g_get_home_dir (), home_stat.st_dev);
-
-  if (file_stat.st_dev == home_stat.st_dev)
-    {
-      g_test_skip ("The file has to be on another filesystem than the home folder to run this test");
-
-      g_object_unref (stream);
-      g_object_unref (file);
-
-      return;
-    }
-
-  mount = g_unix_mount_for (g_file_peek_path (file), NULL);
-  g_assert_nonnull (mount);
-
-  g_assert_true (g_unix_mount_is_system_internal (mount));
-  g_unix_mount_free (mount);
-
-  /* g_file_trash() shouldn't be supported on system internal mounts,
-   * because those are not monitored by gvfsd-trash.
-   */
-  ret = g_file_trash (file, NULL, &error);
-  g_assert_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED);
-  g_test_message ("Error: %s", error->message);
-  g_assert_false (ret);
-  g_clear_error (&error);
-
-  info = g_file_query_info (file,
-                            G_FILE_ATTRIBUTE_ACCESS_CAN_TRASH,
-                            G_FILE_QUERY_INFO_NONE,
-                            NULL,
-                            &error);
-  g_assert_no_error (error);
-
-  g_assert_false (g_file_info_get_attribute_boolean (info,
-                                                     G_FILE_ATTRIBUTE_ACCESS_CAN_TRASH));
-
-  g_io_stream_close (G_IO_STREAM (stream), NULL, &error);
-  g_assert_no_error (error);
-
-  g_object_unref (info);
-  g_object_unref (stream);
-  g_object_unref (file);
-}
-
-int
-main (int argc, char *argv[])
-{
-  g_test_init (&argc, &argv, NULL);
-
-  g_test_bug_base ("htps://gitlab.gnome.org/GNOME/glib/issues/");
-  g_test_bug ("251");
-
-  g_test_add_func ("/trash/not-supported", test_trash_not_supported);
-
-  return g_test_run ();
-}
-