[tracker: 102/102] Merge branch 'gdbus'
- From: Jürg Billeter <juergbi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker: 102/102] Merge branch 'gdbus'
- Date: Tue, 18 Jan 2011 11:21:18 +0000 (UTC)
commit c0b866ea84dca64dcc54e6f6e3887a4c9cfdc29f
Merge: 5724eed 1d5d7b1
Author: Jürg Billeter <j bitron ch>
Date: Tue Jan 18 12:20:34 2011 +0100
Merge branch 'gdbus'
autogen.sh | 2 +-
configure.ac | 81 +--
docs/manpages/tracker-store.1 | 9 -
examples/class-signal/Makefile.am | 23 +-
examples/class-signal/class-signal.c | 84 +--
src/libtracker-client/Makefile.am | 2 +-
src/libtracker-client/tracker.c | 357 ++++++++-
src/libtracker-common/Makefile.am | 17 -
src/libtracker-common/libtracker-common.vapi | 38 +
src/libtracker-common/tracker-common.h | 1 -
src/libtracker-common/tracker-dbus.c | 391 +--------
src/libtracker-common/tracker-dbus.h | 87 +--
src/libtracker-common/tracker-ontologies.h | 1 +
src/libtracker-data/libtracker-data.vapi | 65 ++-
src/libtracker-data/tracker-class.c | 4 +-
src/libtracker-data/tracker-data-backup.c | 34 +-
src/libtracker-data/tracker-data-backup.h | 6 +-
src/libtracker-data/tracker-data-manager.c | 2 -
src/libtracker-data/tracker-data-query.c | 2 -
src/libtracker-data/tracker-data-update.c | 1 -
src/libtracker-data/tracker-db-dbus.c | 2 -
src/libtracker-data/tracker-db-interface-sqlite.c | 2 +-
src/libtracker-data/tracker-property.c | 4 +-
src/libtracker-data/tracker-sparql-query.vala | 17 +-
src/libtracker-extract/tracker-guarantee.c | 3 +-
src/libtracker-fts/tracker-fts.c | 2 +-
src/libtracker-fts/tracker-parser-utils.c | 3 +-
src/libtracker-miner/Makefile.am | 38 +-
src/libtracker-miner/tracker-dbus.c | 383 ---------
src/libtracker-miner/tracker-dbus.h | 45 -
src/libtracker-miner/tracker-miner-dbus.h | 30 -
src/libtracker-miner/tracker-miner-fs.c | 6 +-
src/libtracker-miner/tracker-miner-manager.c | 544 ++++++++-----
src/libtracker-miner/tracker-miner-object.c | 575 +++++++++----
src/libtracker-miner/tracker-miner-web-dbus.h | 50 --
src/libtracker-miner/tracker-miner-web.c | 350 +++++++--
src/libtracker-miner/tracker-thumbnailer.c | 168 +++--
src/miners/flickr/tracker-writeback.c | 79 ++-
src/miners/fs/Makefile.am | 33 +-
src/miners/fs/tracker-dbus.c | 193 -----
src/miners/fs/tracker-main.c | 25 -
src/miners/fs/tracker-miner-files-index.c | 254 +++++-
src/miners/fs/tracker-miner-files-index.h | 17 +-
src/miners/fs/tracker-miner-files.c | 560 ++++++++-----
.../fs}/tracker-power-hal.c | 7 +-
.../fs}/tracker-power-upower.c | 0
.../fs}/tracker-power.h | 0
src/miners/rss/tracker-miner-rss.c | 142 ++--
src/plugins/evolution/Makefile.am | 3 -
src/tracker-control/Makefile.am | 12 -
src/tracker-control/tracker-control.c | 10 +-
src/tracker-extract/Makefile.am | 12 +-
src/tracker-extract/tracker-albumart.c | 101 +--
src/tracker-extract/tracker-dbus.c | 209 -----
src/tracker-extract/tracker-extract-gstreamer.c | 1 -
src/tracker-extract/tracker-extract-gupnp-dlna.c | 1 -
src/tracker-extract/tracker-extract-mp3.c | 1 -
src/tracker-extract/tracker-extract.c | 333 +++++---
src/tracker-extract/tracker-extract.h | 17 +-
src/tracker-extract/tracker-main.c | 28 +-
src/tracker-needle/Makefile.am | 22 +-
src/tracker-needle/tracker-history.vala | 5 +-
src/tracker-needle/tracker-stats.vala | 18 +-
src/tracker-store/.gitignore | 9 +
src/tracker-store/Makefile.am | 93 +--
src/tracker-store/tracker-backup.c | 215 -----
src/tracker-store/tracker-backup.h | 64 --
src/tracker-store/tracker-backup.vala | 98 +++
.../tracker-config.vapi} | 29 +-
src/tracker-store/tracker-dbus.c | 382 ---------
src/tracker-store/tracker-dbus.h | 42 -
src/tracker-store/tracker-dbus.vala | 258 ++++++
src/tracker-store/tracker-events.vapi | 36 +
src/tracker-store/tracker-locale-change.c | 16 +-
.../tracker-locale-change.vapi} | 27 +-
src/tracker-store/tracker-main.c | 520 ------------
src/tracker-store/tracker-main.vala | 373 ++++++++
src/tracker-store/tracker-marshal.list | 12 -
src/tracker-store/tracker-resources.c | 767 -----------------
src/tracker-store/tracker-resources.h | 95 ---
src/tracker-store/tracker-resources.vala | 337 ++++++++
src/tracker-store/tracker-statistics.c | 98 ---
src/tracker-store/tracker-statistics.h | 58 --
.../tracker-statistics.vala} | 38 +-
src/tracker-store/tracker-status.c | 231 -----
src/tracker-store/tracker-status.h | 77 --
src/tracker-store/tracker-status.vala | 122 +++
src/tracker-store/tracker-steroids.c | 886 --------------------
src/tracker-store/tracker-steroids.h | 57 --
src/tracker-store/tracker-steroids.vala | 213 +++++
src/tracker-store/tracker-store.c | 733 ----------------
src/tracker-store/tracker-store.h | 92 --
src/tracker-store/tracker-store.vala | 431 ++++++++++
src/tracker-store/tracker-writeback.vapi | 34 +
src/tracker-utils/Makefile.am | 11 -
src/tracker-utils/tracker-status.c | 150 +++--
src/tracker-writeback/tracker-writeback-consumer.c | 2 +
.../tracker-writeback-dispatcher.c | 6 +
tests/functional-tests/ipc/Makefile.am | 126 ++--
tests/functional-tests/ipc/test-busy-handling.vala | 29 +-
.../ipc/test-class-signal-performance-batch.vala | 18 +-
.../ipc/test-class-signal-performance.vala | 25 +-
tests/functional-tests/ipc/test-class-signal.vala | 13 +-
tests/libtracker-common/Makefile.am | 11 +-
tests/libtracker-common/mock-dbus-gproxy.c | 80 --
tests/libtracker-common/mock-dbus-gproxy.h | 73 --
tests/libtracker-common/mock-dbus.c | 111 ---
tests/libtracker-common/mock-thumbnailer-dbus.c | 79 --
tests/libtracker-common/tracker-dbus-test.c | 351 ++++----
tests/libtracker-data/tracker-backup-test.c | 5 +-
tests/libtracker-data/tracker-sparql-blank-test.c | 4 -
tests/libtracker-miner/miners-mock.c | 7 +
tests/libtracker-miner/thumbnailer-mock.c | 8 +-
.../libtracker-miner/tracker-miner-manager-test.c | 9 +-
tests/libtracker-miner/tracker-thumbnailer-test.c | 13 +-
115 files changed, 5156 insertions(+), 7930 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
