[tracker-miners: 5/5] Merge branch 'wip/carlosg/apps-in-miner-fs' into 'master'
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker-miners: 5/5] Merge branch 'wip/carlosg/apps-in-miner-fs' into 'master'
- Date: Tue, 13 Nov 2018 11:52:46 +0000 (UTC)
commit 6cbd12cbf4ab321ba94e436a52deb02b70da3ff6
Merge: 5df888dd5 8920540bc
Author: Carlos Garnacho <mrgarnacho gmail com>
Date: Tue Nov 13 11:52:31 2018 +0000
Merge branch 'wip/carlosg/apps-in-miner-fs' into 'master'
Fold miner-apps into tracker-miner-fs
See merge request GNOME/tracker-miners!33
meson.build | 2 -
meson_options.txt | 2 -
po/POTFILES.in | 3 -
src/create-miner-symlinks.sh | 8 +-
src/meson.build | 2 +-
src/miners/apps/.gitignore | 2 -
src/miners/apps/meson.build | 45 -
...sktop.Tracker1.Miner.Applications.service.in.in | 10 -
src/miners/apps/tracker-main.c | 323 -------
src/miners/apps/tracker-miner-applications.c | 976 ---------------------
src/miners/apps/tracker-miner-applications.h | 52 --
src/miners/apps/tracker-miner-apps.desktop.in.in | 18 -
src/miners/apps/tracker-miner-apps.service.in | 10 -
....freedesktop.Tracker.Miner.Files.gschema.xml.in | 2 +-
src/miners/fs/tracker-main.c | 111 +++
src/miners/fs/tracker-miner-files.c | 39 +
src/miners/meson.build | 3 -
src/tracker-extract/10-desktop.rule | 4 +
src/tracker-extract/meson.build | 1 +
src/tracker-extract/tracker-extract-decorator.c | 1 +
src/tracker-extract/tracker-extract-desktop.c | 276 ++++++
21 files changed, 436 insertions(+), 1454 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]