Skip to content
Snippets Groups Projects

Remove trashlib support

Merged Frederic Danis requested to merge fdanis/gvfs:wip/fdanis/6154 into apertis/v2019pre
All threads resolved!
4 files
+ 54
2
Compare changes
  • Side-by-side
  • Inline
Files
4
+ 45
0
From: =?utf-8?q?Fr=C3=A9d=C3=A9ric_Danis?= <frederic.danis@collabora.com>
Date: Mon, 22 Jul 2019 16:00:25 +0200
Subject: Remove trashlib support
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
Fixes: APERTIS-6154
Signed-off-by: Frédéric Danis <frederic.danis@collabora.com>
---
daemon/meson.build | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/daemon/meson.build b/daemon/meson.build
index 7f2608b..50c3c17 100644
--- a/daemon/meson.build
+++ b/daemon/meson.build
@@ -1,5 +1,3 @@
-subdir('trashlib')
-
# D-Bus and systemd service files
dbus_service = gvfs_namespace + '.Daemon'
dbus_exec = 'gvfsd'
@@ -186,20 +184,6 @@ cflags = [
programs += [['gvfsd-ftp', sources, [], cflags]]
mounts += ['ftp', 'ftps', 'ftpis']
-sources = files('gvfsbackendtrash.c')
-
-deps = [libtrash_dep]
-
-cflags = [
- '-DBACKEND_HEADER=gvfsbackendtrash.h',
- '-DDEFAULT_BACKEND_TYPE=trash',
- '-DBACKEND_TYPES="trash", G_VFS_TYPE_BACKEND_TRASH,',
- '-DMAX_JOB_THREADS=10'
-]
-
-programs += [['gvfsd-trash', sources, deps, cflags]]
-mounts += ['trash']
-
sources = files('gvfsbackendrecent.c')
cflags = [
Loading