[tracker: 62/62] Merge branch 'dbus-fd-experiment'
- From: Martyn James Russell <mr src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker: 62/62] Merge branch 'dbus-fd-experiment'
- Date: Wed, 23 Jun 2010 13:55:37 +0000 (UTC)
commit 10d7d975b66efd6237d60427c4fc8673a2953849
Merge: ffd7604 398071e
Author: Martyn Russell <martyn lanedo com>
Date: Wed Jun 23 14:53:33 2010 +0100
Merge branch 'dbus-fd-experiment'
configure.ac | 32 +
examples/Makefile.am | 3 +-
examples/tracker-steroids/.gitignore | 5 +
examples/tracker-steroids/Makefile.am | 50 +
examples/tracker-steroids/benchmark-tracker-ipc.c | 91 ++
examples/tracker-steroids/benchmark-update.c | 92 ++
examples/tracker-steroids/benchmark.c | 91 ++
examples/tracker-steroids/steroids-sparql-async.c | 80 ++
.../steroids-sparql-update-async.c | 98 ++
examples/tracker-steroids/steroids-sparql.c | 68 +
src/libtracker-client/Makefile.am | 2 +
src/libtracker-client/tracker.c | 1421 ++++++++++++++++++--
src/libtracker-client/tracker.h | 30 +
src/libtracker-miner/tracker-miner-fs.c | 50 +-
src/libtracker-miner/tracker-miner-object.c | 26 +-
src/libtracker-miner/tracker-miner-object.h | 3 +-
src/miners/fs/tracker-miner-files-reindex.c | 32 +-
src/miners/fs/tracker-miner-files.c | 47 +-
src/tracker-store/Makefile.am | 6 +
src/tracker-store/tracker-dbus.c | 19 +
src/tracker-store/tracker-steroids.c | 671 +++++++++
src/tracker-store/tracker-steroids.h | 57 +
tests/Makefile.am | 3 +-
tests/tracker-steroids/.gitignore | 1 +
tests/tracker-steroids/Makefile.am | 31 +
tests/tracker-steroids/tracker-test.c | 655 +++++++++
26 files changed, 3487 insertions(+), 177 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]