[tracker/harmattan-pre-signal-updates: 1105/1380] Merge branch 'master' into harmattan
- From: Martyn James Russell <mr src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker/harmattan-pre-signal-updates: 1105/1380] Merge branch 'master' into harmattan
- Date: Wed, 22 Sep 2010 15:35:22 +0000 (UTC)
commit 71235cd4914e394ae7c40c6c065e65a699fc0265
Merge: f90beee 0336bcc
Author: Martyn Russell <martyn lanedo com>
Date: Wed Aug 18 11:28:16 2010 +0100
Merge branch 'master' into harmattan
configure.ac | 31 +-
data/Makefile.am | 2 +-
data/db/Makefile.am | 8 -
data/db/sqlite-tracker.sql | 8 -
data/ontologies/33-nfo.ontology | 2 +-
docs/manpages/tracker-store.1 | 9 +
.../libtracker-extract-sections.txt | 1 +
docs/reference/libtracker-miner/Makefile.am | 2 +-
.../libtracker-miner/libtracker-miner-sections.txt | 13 +-
docs/reference/libtracker-sparql/examples.sgml | 177 +++-
docs/tools/Makefile.am | 4 +-
docs/tools/ontology-graph.c | 1 -
examples/Makefile.am | 3 +-
examples/libtracker-extract/Makefile.am | 3 +-
.../libtracker-extract/tracker-extract-mockup.c | 10 +-
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 --
po/es.po | 624 +++++++------
src/Makefile.am | 2 +
src/libtracker-bus/.gitignore | 3 +
src/libtracker-bus/Makefile.am | 83 ++
src/libtracker-bus/config.vapi | 23 +
src/libtracker-bus/tracker-array-cursor.vala | 63 ++
src/libtracker-bus/tracker-bus-array-update.c | 265 ++++++
src/libtracker-bus/tracker-bus-array-update.h | 33 +
src/libtracker-bus/tracker-bus-array-update.vapi | 23 +
src/libtracker-bus/tracker-bus-fd-cursor.c | 382 ++++++++
src/libtracker-bus/tracker-bus-fd-cursor.h | 45 +
src/libtracker-bus/tracker-bus-fd-cursor.vapi | 21 +
src/libtracker-bus/tracker-bus-fd-update.c | 510 ++++++++++
src/libtracker-bus/tracker-bus-fd-update.h | 47 +
src/libtracker-bus/tracker-bus-fd-update.vapi | 27 +
src/libtracker-bus/tracker-bus-shared.c | 83 ++
.../tracker-bus-shared.h} | 22 +-
src/libtracker-bus/tracker-bus.vala | 207 ++++
src/libtracker-client/tracker.c | 131 +++-
src/libtracker-client/tracker.h | 80 +-
src/libtracker-common/tracker-log.c | 8 +
src/libtracker-data/.gitignore | 4 +-
src/libtracker-data/Makefile.am | 10 +-
src/libtracker-data/libtracker-data.vapi | 36 +-
src/libtracker-data/tracker-data-manager.c | 94 +--
src/libtracker-data/tracker-data-manager.h | 3 -
src/libtracker-data/tracker-data-update.c | 155 ++--
src/libtracker-data/tracker-data-update.h | 20 +-
src/libtracker-data/tracker-db-interface-sqlite.c | 95 ++-
src/libtracker-data/tracker-db-interface.h | 2 +-
src/libtracker-data/tracker-db-journal.c | 1 +
src/libtracker-data/tracker-db-manager.c | 164 +---
src/libtracker-data/tracker-sparql-expression.vala | 70 +-
src/libtracker-data/tracker-sparql-pattern.vala | 46 +-
src/libtracker-data/tracker-sparql-query.vala | 77 +-
src/libtracker-data/tracker-sparql-scanner.vala | 26 +-
src/libtracker-data/tracker-turtle-reader.vala | 19 +-
src/libtracker-direct/.gitignore | 2 +
src/libtracker-direct/Makefile.am | 58 ++
src/libtracker-direct/tracker-direct.vala | 66 ++
src/libtracker-extract/Makefile.am | 3 +-
src/libtracker-extract/tracker-data.h | 4 +-
src/libtracker-extract/tracker-xmp.c | 2 +-
src/libtracker-extract/tracker-xmp.h | 2 +-
src/libtracker-fts/tracker-fts.c | 6 +-
src/libtracker-miner/Makefile.am | 3 +-
src/libtracker-miner/tracker-miner-fs.c | 166 ++--
src/libtracker-miner/tracker-miner-fs.h | 2 +-
src/libtracker-miner/tracker-miner-object.c | 501 +----------
src/libtracker-miner/tracker-miner-object.h | 43 +-
src/libtracker-miner/tracker-miner-web.h | 1 +
src/libtracker-miner/tracker-miner.vapi | 5 +-
src/libtracker-miner/tracker-network-provider.h | 1 +
src/libtracker-sparql/.gitignore | 2 +-
src/libtracker-sparql/Makefile.am | 54 +-
src/libtracker-sparql/tracker-connection.vala | 23 +-
src/libtracker-sparql/tracker-plugin-loader.vala | 20 +-
src/miners/flickr/Makefile.am | 11 +-
src/miners/flickr/tracker-miner-flickr.vala | 131 ++--
src/miners/flickr/tracker-writeback.c | 156 +++
src/miners/flickr/tracker-writeback.h | 48 +
src/miners/fs/Makefile.am | 5 +-
src/miners/fs/tracker-main.c | 1 -
src/miners/fs/tracker-miner-applications.c | 6 +-
src/miners/fs/tracker-miner-files-reindex.c | 75 +-
src/miners/fs/tracker-miner-files.c | 87 +-
src/miners/rss/Makefile.am | 5 +-
src/miners/rss/tracker-miner-rss.c | 122 ++-
src/miners/rss/tracker-miner-rss.h | 2 +
src/plugins/Makefile.am | 4 -
src/plugins/evolution/Makefile.am | 4 +-
src/plugins/evolution/tracker-evolution-plugin.c | 304 ++++---
src/plugins/kmail/Makefile.am | 49 -
src/plugins/kmail/tracker-kmail-common.h | 77 --
src/plugins/kmail/tracker-kmail-registrar.c | 682 -------------
src/plugins/kmail/tracker-kmail-registrar.h | 93 --
src/plugins/kmail/tracker-kmail-registrar.xml | 39 -
src/tracker-control/Makefile.am | 5 +-
src/tracker-control/tracker-control.c | 4 +-
src/tracker-extract/Makefile.am | 5 +-
src/tracker-extract/tracker-extract-flac.c | 8 +-
src/tracker-extract/tracker-extract-gif.c | 13 +-
src/tracker-extract/tracker-extract-gstreamer.c | 10 +-
src/tracker-extract/tracker-extract-gupnp-dlna.c | 2 +-
src/tracker-extract/tracker-extract-jpeg.c | 12 +-
src/tracker-extract/tracker-extract-libxine.c | 4 +-
src/tracker-extract/tracker-extract-mp3.c | 1000 ++++++++++----------
src/tracker-extract/tracker-extract-mplayer.c | 2 +-
src/tracker-extract/tracker-extract-msoffice.c | 4 +-
src/tracker-extract/tracker-extract-oasis.c | 409 ++++++--
src/tracker-extract/tracker-extract-png.c | 7 +-
src/tracker-extract/tracker-extract-tiff.c | 9 +-
src/tracker-extract/tracker-extract-totem.c | 11 +-
src/tracker-extract/tracker-extract-vorbis.c | 8 +-
src/tracker-extract/tracker-extract.c | 5 +-
src/tracker-extract/tracker-gsf.c | 15 +-
src/tracker-extract/tracker-gsf.h | 7 +-
src/tracker-preferences/Makefile.am | 1 -
src/tracker-status-icon/Makefile.am | 2 -
src/tracker-store/Makefile.am | 7 +-
src/tracker-store/tracker-dbus.c | 26 +-
src/tracker-store/tracker-events.c | 23 +
src/tracker-store/tracker-events.h | 1 +
src/tracker-store/tracker-main.c | 4 -
src/tracker-store/tracker-push-registrar.c | 336 -------
src/tracker-store/tracker-push-registrar.h | 81 --
src/tracker-store/tracker-push.c | 354 -------
src/tracker-store/tracker-resources.c | 46 +-
src/tracker-store/tracker-steroids.c | 1 -
src/tracker-store/tracker-store.c | 592 ++++---------
src/tracker-store/tracker-store.h | 7 +-
src/tracker-utils/Makefile.am | 4 +-
src/tracker-utils/tracker-import.c | 43 +-
src/tracker-utils/tracker-info.c | 183 ++--
src/tracker-utils/tracker-search.c | 677 +++++++-------
src/tracker-utils/tracker-sparql.c | 312 +++----
src/tracker-utils/tracker-stats.c | 79 +-
src/tracker-utils/tracker-status.c | 33 +-
src/tracker-utils/tracker-tag.c | 391 ++++----
.../tracker-writeback-dispatcher.c | 41 +-
src/tracker-writeback/tracker-writeback-file.c | 3 +-
src/tracker-writeback/tracker-writeback-xmp.c | 36 +
tests/Makefile.am | 4 +
tests/functional-tests/.gitignore | 10 +
tests/functional-tests/Makefile.am | 97 ++-
tests/functional-tests/bus-query-test.vala | 10 +
tests/functional-tests/bus-update-test.vala | 10 +
tests/functional-tests/default-update-test.vala | 14 +
tests/functional-tests/direct-query-test.vala | 17 +
tests/functional-tests/shared-query-test.vala | 106 ++
tests/functional-tests/shared-update-test.vala | 155 +++
tests/libtracker-data/Makefile.am | 4 +
tests/libtracker-data/tracker-backup-test.c | 2 -
.../libtracker-data/tracker-ontology-change-test.c | 2 -
tests/libtracker-data/tracker-ontology-test.c | 2 -
tests/libtracker-data/tracker-sparql-blank-test.c | 2 -
tests/libtracker-data/tracker-sparql-test.c | 4 -
tests/libtracker-extract/Makefile.am | 4 +-
tests/libtracker-extract/tracker-xmp-test.c | 3 +-
tests/libtracker-fts/Makefile.am | 2 +
tests/libtracker-fts/tracker-fts-test.c | 2 -
tests/libtracker-miner/Makefile.am | 4 +-
tests/tracker-miner-fs/Makefile.am | 2 +-
tests/tracker-steroids/Makefile.am | 2 +-
tests/tracker-steroids/tracker-test.c | 427 +++++-----
utils/services/Makefile.am | 1 +
169 files changed, 6435 insertions(+), 6492 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
