[tracker/harmattan: 1207/2240] Merge branch 'master' into harmattan
- From: Martyn James Russell <mr src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [tracker/harmattan: 1207/2240] Merge branch 'master' into harmattan
- Date: Thu, 4 Feb 2010 17:16:27 +0000 (UTC)
commit f81241cd9745ea46ee756a2252fc746349021530
Merge: 88511d0 87b2e72
Author: Martyn Russell <martyn lanedo com>
Date: Fri Oct 2 17:02:51 2009 +0100
Merge branch 'master' into harmattan
.svnignore | 8 -
NEWS | 102 +
autogen.sh | 2 +-
configure.ac | 43 +-
data/dbus/tracker-miner.xml | 8 -
data/ontologies/32-nco.ontology | 1 -
data/ontologies/36-scal.ontology | 239 +++-
data/ontologies/40-mlo.description | 1 +
data/tracker-client.pc.in | 2 +-
docs/.svnignore | 13 -
docs/manpages/tracker-processes.1 | 2 +-
docs/reference/Makefile.am | 3 +-
.../libtracker-common/libtracker-common-docs.sgml | 59 +-
.../libtracker-common-sections.txt | 578 ++++--
docs/reference/libtracker-miner/Makefile.am | 73 +
.../libtracker-miner/libtracker-miner-docs.sgml | 42 +
.../libtracker-miner/libtracker-miner-sections.txt | 48 +
.../libtracker-miner/libtracker-miner.types | 8 +
.../libtracker-miner/tmpl/tracker-miner-fs.sgml | 135 ++
.../tmpl/tracker-miner-manager.sgml | 176 ++
.../libtracker-miner/tmpl/tracker-miner.sgml | 196 ++
docs/reference/libtracker-miner/version.xml.in | 1 +
po/es.po | 2130 +++++++++++---------
src/Makefile.am | 2 +-
src/libtracker-client/tracker.c | 4 +
src/libtracker-common/Makefile.am | 2 -
src/libtracker-common/libtracker-common.vapi | 6 +-
src/libtracker-common/tracker-common.h | 4 +-
src/libtracker-common/tracker-config-file.c | 1 +
src/libtracker-common/tracker-dbus.h | 4 -
src/libtracker-common/tracker-property.c | 12 +-
src/libtracker-common/tracker-property.h | 5 +-
src/libtracker-common/tracker-type-utils.c | 1 +
src/libtracker-data/Makefile.am | 1 +
src/libtracker-data/tracker-data-backup.h | 32 +-
src/libtracker-data/tracker-data-manager.c | 19 +-
src/libtracker-data/tracker-data-manager.h | 26 +-
src/libtracker-data/tracker-data-query.c | 5 +-
src/libtracker-data/tracker-data-query.h | 18 +-
src/libtracker-data/tracker-data-update.c | 24 +-
src/libtracker-data/tracker-data-update.h | 103 +-
src/libtracker-data/tracker-data.h | 42 +
src/libtracker-data/tracker-sparql-query.vala | 490 +++--
src/libtracker-data/tracker-turtle-reader.vala | 4 +-
src/libtracker-db/Makefile.am | 3 +-
src/libtracker-db/tracker-db-backup.c | 9 +-
src/libtracker-db/tracker-db-backup.h | 33 +-
src/libtracker-db/tracker-db-dbus.h | 8 +-
src/libtracker-db/tracker-db-interface-sqlite.c | 11 +-
src/libtracker-db/tracker-db-interface-sqlite.h | 54 +-
src/libtracker-db/tracker-db-interface.h | 233 ++--
src/libtracker-db/tracker-db-journal.h | 32 +-
src/libtracker-db/tracker-db-manager.h | 40 +-
src/libtracker-db/tracker-db.h | 43 +
src/libtracker-fts/Makefile.am | 33 +
.../tracker-fts-config.c | 0
.../tracker-fts-config.h | 0
.../tracker-fts-hash.c | 0
.../tracker-fts-hash.h | 0
src/{tracker-fts => libtracker-fts}/tracker-fts.c | 41 +-
src/{tracker-fts => libtracker-fts}/tracker-fts.h | 0
.../tracker-parser.c | 38 +-
.../tracker-parser.h | 13 +-
src/libtracker-miner/tracker-crawler.c | 2 +-
src/libtracker-miner/tracker-miner-dbus.h | 4 +
src/libtracker-miner/tracker-miner-fs.c | 35 +
src/libtracker-miner/tracker-miner-manager.c | 245 +++-
src/libtracker-miner/tracker-miner-manager.h | 12 +
src/libtracker-miner/tracker-miner.c | 139 +-
src/libtracker-miner/tracker-miner.h | 4 -
src/libtracker-miner/tracker-monitor.c | 12 +-
src/plugins/evolution/tracker-evolution-plugin.c | 6 +-
src/plugins/kmail/tracker-kmail-registrar.c | 16 +-
src/tracker-extract/tracker-albumart.c | 17 +-
src/tracker-extract/tracker-dbus.c | 4 +-
src/tracker-extract/tracker-dbus.h | 4 +-
src/tracker-extract/tracker-extract-mplayer.c | 6 +-
src/tracker-extract/tracker-extract-pdf.c | 69 +-
src/tracker-extract/tracker-extract.c | 14 +-
src/tracker-extract/tracker-extract.h | 2 +-
src/tracker-extract/tracker-main.c | 21 +-
src/tracker-fts/Makefile.am | 29 -
src/tracker-miner-fs/Makefile.am | 6 +-
src/tracker-miner-fs/tracker-config.c | 297 +++-
src/tracker-miner-fs/tracker-config.h | 12 +-
src/tracker-miner-fs/tracker-dbus.c | 267 ---
src/tracker-miner-fs/tracker-dbus.h | 49 -
src/tracker-miner-fs/tracker-main.c | 23 +-
src/tracker-miner-fs/tracker-miner-files.c | 167 +-
src/tracker-miner-fs/tracker-thumbnailer.c | 139 +-
src/tracker-miner-fs/tracker-thumbnailer.h | 22 +-
src/tracker-miner-fs/tracker-utils.c | 43 -
src/tracker-miner-fs/tracker-utils.h | 31 -
src/tracker-preferences/tracker-preferences.ui | 3 +-
src/tracker-search-bar/tracker-results-window.c | 3 +-
src/tracker-search-tool/tracker-entry.gs | 2 +-
src/tracker-search-tool/tracker-query.gs | 17 +-
src/tracker-search-tool/tracker-utils.gs | 12 +-
src/tracker-store/tracker-backup.c | 2 +-
src/tracker-store/tracker-dbus.c | 29 +
src/tracker-store/tracker-main.c | 4 -
src/tracker-store/tracker-resources.c | 20 +-
src/tracker-store/tracker-resources.h | 3 +
src/tracker-store/tracker-store.c | 80 +-
src/tracker-store/tracker-store.h | 3 +
src/tracker-utils/tracker-status.c | 322 +---
tests/Makefile.am | 1 +
tests/libtracker-data/tracker-ontology-test.c | 4 +-
tests/libtracker-data/tracker-sparql-test.c | 6 +-
tests/libtracker-db/tracker-db-dbus-test.c | 7 +-
tests/libtracker-db/tracker-db-manager-common.h | 4 +-
.../libtracker-db/tracker-db-manager-test-attach.c | 7 +-
.../libtracker-db/tracker-db-manager-test-custom.c | 6 +-
.../tracker-db-manager-test-unattach.c | 6 +-
tests/libtracker-fts/.gitignore | 2 +
tests/libtracker-fts/Makefile.am | 48 +
tests/libtracker-fts/data.ontology | 23 +
tests/libtracker-fts/fts3aa-1.out | 16 +
tests/libtracker-fts/fts3aa-1.rq | 1 +
tests/libtracker-fts/fts3aa-2.out | 8 +
tests/libtracker-fts/fts3aa-2.rq | 1 +
tests/libtracker-fts/fts3aa-data.rq | 34 +
tests/libtracker-fts/fts3ae-1.out | 7 +
tests/libtracker-fts/fts3ae-1.rq | 1 +
tests/libtracker-fts/fts3ae-data.rq | 45 +
tests/libtracker-fts/tracker-fts-test.c | 228 +++
tests/tracker-miner-fs/Makefile.am | 2 -
utils/services/.gitignore | 1 +
utils/services/Makefile.am | 79 +-
utils/services/data-validator.c | 4 +-
utils/services/gen-doc.sh | 10 +
utils/services/ontology-validator.c | 2 +-
utils/services/qname.c | 36 +-
utils/services/qname.h | 4 +-
utils/services/ttl2html.c | 8 +-
utils/services/ttl_graphviz.c | 2 +-
utils/services/ttl_html.c | 5 +-
utils/services/ttl_html.h | 3 +-
utils/services/ttl_loader.c | 7 +-
utils/services/ttl_model.c | 15 +-
utils/services/ttl_model.h | 1 +
utils/tracker-fts/Makefile.am | 6 +-
utils/tracker-fts/tracker-fts-test.c | 3 +-
143 files changed, 5122 insertions(+), 2984 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
