[tracker/harmattan: 1797/2240] Merge branch 'master' into harmattan
- From: Martyn James Russell <mr src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [tracker/harmattan: 1797/2240] Merge branch 'master' into harmattan
- Date: Thu, 4 Feb 2010 17:20:19 +0000 (UTC)
commit 6e086c1767e197876d910d2e5aa2cfd8be7b4e55
Merge: 34d40be 0c7a732
Author: Martyn Russell <martyn lanedo com>
Date: Fri Dec 11 15:07:51 2009 +0000
Merge branch 'master' into harmattan
.gitignore | 2 +
NEWS | 62 ++
README | 8 +-
TODO | 6 +-
configure.ac | 171 +++--
data/Makefile.am | 2 +-
data/db/sqlite-contents.sql | 8 +-
data/db/sqlite-tracker.sql | 2 +-
data/dbus/Makefile.am | 2 +-
data/dbus/tracker-extract.xml | 2 +-
data/dbus/tracker-resources-class.xml | 2 +-
data/dbus/tracker-resources.xml | 4 +-
data/dbus/tracker-statistics.xml | 20 +-
data/languages/Makefile.am | 2 +-
data/ontologies/10-xsd.description | 2 +-
data/ontologies/11-rdf.description | 2 +-
data/ontologies/12-nrl.description | 2 +-
data/ontologies/20-dc.description | 2 +-
data/ontologies/30-nie.description | 4 +-
data/ontologies/30-nie.ontology | 8 +
data/ontologies/31-nao.ontology | 8 +
data/ontologies/32-nco.ontology | 2 +-
data/ontologies/33-nfo.ontology | 5 +-
data/ontologies/34-nmo.ontology | 42 +-
data/ontologies/36-scal.ontology | 10 +-
data/ontologies/38-nmm.description | 2 +-
data/ontologies/38-nmm.ontology | 5 +-
data/ontologies/39-mto.ontology | 24 +-
data/ontologies/40-mlo.ontology | 2 +-
data/ontologies/41-mfo.ontology | 12 +-
data/ontologies/89-mtp.ontology | 4 +-
data/tracker-stop-words.txt | 6 +-
docs/manpages/tracker-control.1 | 12 +-
docs/manpages/tracker-extract.1 | 2 +-
docs/manpages/tracker-search-bar.1 | 4 +-
docs/manpages/tracker-search-tool.1 | 4 +-
docs/manpages/tracker-search.1 | 4 +-
docs/manpages/tracker-sparql.1 | 30 +-
docs/manpages/tracker-stats.1 | 6 +-
docs/manpages/tracker-status-icon.1 | 4 +-
docs/manpages/tracker-status.1 | 4 +-
docs/manpages/tracker-store.1 | 10 +-
docs/manpages/tracker-tag.1 | 18 +-
docs/ontologies/README.ontologiesdoc | 13 +-
docs/ontologies/nie/explanation.html | 49 +-
docs/ontologies/nmo/explanation.html | 8 +-
docs/reference/README | 4 +-
.../libtracker-client/libtracker-client-docs.sgml | 6 +-
.../libtracker-client-sections.txt | 36 +-
.../libtracker-miner/tmpl/tracker-miner-fs.sgml | 168 -----
.../tmpl/tracker-miner-manager.sgml | 176 -----
.../libtracker-miner/tmpl/tracker-miner.sgml | 217 ------
examples/libtracker-miner/tracker-main.c | 114 ++--
examples/libtracker-miner/tracker-miner-test.c | 6 +-
examples/libtracker-miner/tracker-miner-test.h | 4 +-
po/POTFILES.in | 3 +-
po/et.po | 28 +-
python/FUSE/trackerfs.py | 22 +-
python/Makefile.am | 2 +-
python/SearchTool/README | 2 +-
python/gtk-sparql/Makefile.am | 6 +-
python/gtk-sparql/store.py | 6 +-
python/music/lyrics.py | 4 +-
python/rss_reader/Makefile.am | 11 +
python/rss_reader/signaler.py | 15 +-
src/libtracker-client/tracker.c | 610 ++++++++++-------
src/libtracker-client/tracker.h | 42 +-
src/libtracker-common/tracker-class.c | 78 +-
src/libtracker-common/tracker-class.h | 16 +-
src/libtracker-common/tracker-config-file.c | 110 ++--
src/libtracker-common/tracker-config-file.h | 8 +-
src/libtracker-common/tracker-dbus.c | 94 ++--
src/libtracker-common/tracker-dbus.h | 146 ++--
src/libtracker-common/tracker-file-utils.c | 166 +++---
src/libtracker-common/tracker-file-utils.h | 12 +-
src/libtracker-common/tracker-ioprio.c | 40 +-
src/libtracker-common/tracker-keyfile-object.c | 120 ++--
src/libtracker-common/tracker-keyfile-object.h | 76 +-
src/libtracker-common/tracker-language.c | 138 ++--
src/libtracker-common/tracker-language.h | 16 +-
src/libtracker-common/tracker-log.c | 72 +-
src/libtracker-common/tracker-log.h | 28 +-
src/libtracker-common/tracker-namespace.c | 62 +-
src/libtracker-common/tracker-namespace.h | 12 +-
src/libtracker-common/tracker-ontology.c | 36 +-
src/libtracker-common/tracker-ontology.h | 34 +-
src/libtracker-common/tracker-os-dependant-unix.c | 110 ++--
src/libtracker-common/tracker-os-dependant-win.c | 74 +-
src/libtracker-common/tracker-os-dependant.h | 20 +-
src/libtracker-common/tracker-power-devicekit.c | 64 +-
src/libtracker-common/tracker-power-hal.c | 190 +++---
src/libtracker-common/tracker-power.h | 10 +-
src/libtracker-common/tracker-property.c | 248 ++++----
src/libtracker-common/tracker-property.h | 44 +-
src/libtracker-common/tracker-statement-list.c | 36 +-
src/libtracker-common/tracker-statement-list.h | 38 +-
src/libtracker-common/tracker-storage-hal.c | 364 +++++-----
src/libtracker-common/tracker-storage.h | 20 +-
src/libtracker-common/tracker-type-utils.c | 42 +-
src/libtracker-common/tracker-type-utils.h | 46 +-
src/libtracker-common/tracker-utils.c | 536 +++++++-------
src/libtracker-common/tracker-utils.h | 38 +-
src/libtracker-data/tracker-data-backup.c | 30 +-
src/libtracker-data/tracker-data-backup.h | 16 +-
src/libtracker-data/tracker-data-manager.c | 170 +++---
src/libtracker-data/tracker-data-manager.h | 8 +-
src/libtracker-data/tracker-data-query.c | 20 +-
src/libtracker-data/tracker-data-query.h | 2 +-
src/libtracker-data/tracker-data-update.c | 198 +++---
src/libtracker-data/tracker-data-update.h | 12 +-
src/libtracker-data/tracker-sparql-query.vala | 338 +++++++---
src/libtracker-db/tracker-db-backup.c | 28 +-
src/libtracker-db/tracker-db-backup.h | 14 +-
src/libtracker-db/tracker-db-dbus.c | 116 ++--
src/libtracker-db/tracker-db-dbus.h | 14 +-
src/libtracker-db/tracker-db-interface-sqlite.c | 284 ++++----
src/libtracker-db/tracker-db-interface-sqlite.h | 26 +-
src/libtracker-db/tracker-db-interface.c | 168 +++---
src/libtracker-db/tracker-db-interface.h | 158 +++---
src/libtracker-db/tracker-db-journal.c | 2 +-
src/libtracker-db/tracker-db-manager.c | 376 +++++-----
src/libtracker-db/tracker-db-manager.h | 8 +-
src/libtracker-fts/tracker-fts-config.c | 178 +++---
src/libtracker-fts/tracker-fts-config.h | 12 +-
src/libtracker-fts/tracker-fts-hash.c | 12 +-
src/libtracker-fts/tracker-fts.c | 282 ++++----
src/libtracker-fts/tracker-parser.c | 158 +++---
src/libtracker-fts/tracker-parser.h | 40 +-
src/libtracker-gtk/tracker-keyword-store.c | 70 +-
src/libtracker-gtk/tracker-keyword-store.h | 26 +-
src/libtracker-gtk/tracker-metadata-tile.c | 262 ++++----
src/libtracker-gtk/tracker-metadata-tile.h | 26 +-
src/libtracker-gtk/tracker-tag-bar.c | 66 +-
src/libtracker-gtk/tracker-tag-bar.h | 28 +-
src/libtracker-gtk/tracker-ui.c | 10 +-
src/libtracker-gtk/tracker-ui.h | 10 +-
src/libtracker-gtk/tracker-utils.c | 30 +-
src/libtracker-gtk/tracker-utils.h | 10 +-
src/libtracker-miner/tracker-crawler.c | 248 ++++----
src/libtracker-miner/tracker-crawler.h | 38 +-
src/libtracker-miner/tracker-miner-dbus.h | 40 +-
src/libtracker-miner/tracker-miner-fs.c | 742 ++++++++++----------
src/libtracker-miner/tracker-miner-fs.h | 35 +-
src/libtracker-miner/tracker-miner-manager.c | 244 ++++----
src/libtracker-miner/tracker-miner-manager.h | 46 +-
src/libtracker-miner/tracker-miner.c | 384 ++++++-----
src/libtracker-miner/tracker-miner.h | 91 ++--
src/libtracker-miner/tracker-monitor.c | 564 ++++++++--------
src/libtracker-miner/tracker-monitor.h | 30 +-
src/libtracker-miner/tracker-utils.c | 14 +-
src/libtracker-miner/tracker-utils.h | 6 +-
...-freedesktop-Tracker-evolution-plugin.eplug.xml | 2 +-
src/plugins/evolution/tracker-evolution-plugin.c | 460 ++++++------
src/plugins/kmail/tracker-kmail-common.h | 82 ++--
src/plugins/kmail/tracker-kmail-registrar.c | 188 +++---
src/plugins/kmail/tracker-kmail-registrar.h | 56 +-
src/tracker-control/tracker-control.c | 168 +++---
src/tracker-extract/Makefile.am | 6 +
src/tracker-extract/dummy.c | 12 +-
src/tracker-extract/tracker-albumart-dummy.c | 2 +-
src/tracker-extract/tracker-albumart-generic.h | 4 +-
src/tracker-extract/tracker-albumart-pixbuf.c | 14 +-
src/tracker-extract/tracker-albumart-quill.cpp | 2 +-
src/tracker-extract/tracker-albumart.c | 424 ++++++------
src/tracker-extract/tracker-albumart.h | 10 +-
src/tracker-extract/tracker-config.c | 128 ++--
src/tracker-extract/tracker-config.h | 12 +-
src/tracker-extract/tracker-dbus.c | 50 +-
src/tracker-extract/tracker-exif.c | 36 +-
src/tracker-extract/tracker-exif.h | 6 +-
src/tracker-extract/tracker-extract-abw.c | 6 +-
.../tracker-extract-gstreamer-helix.c | 210 +++---
src/tracker-extract/tracker-extract-gstreamer.c | 248 ++++----
src/tracker-extract/tracker-extract-html.c | 22 +-
src/tracker-extract/tracker-extract-imagemagick.c | 8 +-
src/tracker-extract/tracker-extract-jpeg.c | 38 +-
src/tracker-extract/tracker-extract-libxine.c | 140 ++--
src/tracker-extract/tracker-extract-mockup.c | 4 +-
src/tracker-extract/tracker-extract-mp3.c | 438 ++++++------
src/tracker-extract/tracker-extract-mplayer.c | 76 +-
src/tracker-extract/tracker-extract-msoffice.c | 712 ++++++++++++++++---
src/tracker-extract/tracker-extract-oasis.c | 70 +-
src/tracker-extract/tracker-extract-pdf.c | 20 +-
src/tracker-extract/tracker-extract-playlist.c | 18 +-
src/tracker-extract/tracker-extract-png.c | 60 +-
src/tracker-extract/tracker-extract-ps.c | 62 +-
src/tracker-extract/tracker-extract-text.c | 90 ++--
src/tracker-extract/tracker-extract-tiff.c | 188 +++---
src/tracker-extract/tracker-extract-totem.c | 40 +-
src/tracker-extract/tracker-extract-vorbis.c | 142 ++--
src/tracker-extract/tracker-extract-xmp.c | 20 +-
src/tracker-extract/tracker-extract.c | 162 +++---
src/tracker-extract/tracker-extract.h | 28 +-
src/tracker-extract/tracker-fts-config.c | 178 +++---
src/tracker-extract/tracker-fts-config.h | 12 +-
src/tracker-extract/tracker-iptc.c | 76 +-
src/tracker-extract/tracker-iptc.h | 4 +-
src/tracker-extract/tracker-main.c | 68 +-
src/tracker-extract/tracker-main.h | 2 +-
src/tracker-extract/tracker-msword.cpp | 113 +++
src/tracker-extract/tracker-msword.h | 31 +
src/tracker-extract/tracker-topanalyzer.cpp | 94 ++--
src/tracker-extract/tracker-topanalyzer.h | 6 +-
src/tracker-extract/tracker-xmp.c | 232 +++---
src/tracker-extract/tracker-xmp.h | 12 +-
src/tracker-miner-fs/tracker-config.c | 656 +++++++++---------
src/tracker-miner-fs/tracker-config.h | 54 +-
src/tracker-miner-fs/tracker-main.c | 132 ++--
src/tracker-miner-fs/tracker-miner-applications.c | 95 ++--
src/tracker-miner-fs/tracker-miner-applications.h | 4 +-
src/tracker-miner-fs/tracker-miner-files.c | 521 +++++++-------
src/tracker-miner-fs/tracker-miner-files.h | 4 +-
src/tracker-miner-fs/tracker-thumbnailer.c | 142 ++--
src/tracker-miner-fs/tracker-thumbnailer.h | 8 +-
src/tracker-miner-fs/tracker-volume-cleanup.c | 32 +-
src/tracker-preferences/tracker-preferences.vala | 8 +-
src/tracker-search-bar/tracker-aligned-window.c | 286 ++++----
src/tracker-search-bar/tracker-aligned-window.h | 18 +-
src/tracker-search-bar/tracker-applet.c | 166 +++---
src/tracker-search-bar/tracker-results-window.c | 601 ++++++++--------
src/tracker-search-bar/tracker-results-window.h | 2 +-
src/tracker-search-bar/tracker-utils.c | 28 +-
src/tracker-search-tool/tracker-category-view.gs | 61 +-
src/tracker-search-tool/tracker-metadata-tile.gs | 139 ++--
src/tracker-search-tool/tracker-query.gs | 56 +-
src/tracker-search-tool/tracker-result-grid.gs | 80 +--
src/tracker-search-tool/tracker-search-tool.gs | 42 +-
src/tracker-search-tool/tracker-utils.gs | 74 +-
src/tracker-status-icon/eggaccelerators.c | 68 +-
src/tracker-status-icon/tomboykeybinder.c | 136 ++--
src/tracker-status-icon/tomboykeybinder.h | 6 +-
src/tracker-status-icon/tracker-icon-config.c | 114 ++--
src/tracker-status-icon/tracker-icon-config.h | 12 +-
src/tracker-status-icon/tracker-main.c | 28 +-
src/tracker-status-icon/tracker-status-icon.c | 296 ++++----
src/tracker-status-icon/tracker-status-icon.h | 4 +-
src/tracker-store/mingw-compat.h | 58 +-
src/tracker-store/tracker-backup.c | 6 +-
src/tracker-store/tracker-backup.h | 26 +-
src/tracker-store/tracker-config.c | 178 +++---
src/tracker-store/tracker-config.h | 12 +-
src/tracker-store/tracker-dbus.c | 128 ++--
src/tracker-store/tracker-events.c | 44 +-
src/tracker-store/tracker-events.h | 8 +-
src/tracker-store/tracker-main.c | 62 +-
src/tracker-store/tracker-push-registrar.c | 86 ++--
src/tracker-store/tracker-push-registrar.h | 20 +-
src/tracker-store/tracker-push.c | 92 ++--
src/tracker-store/tracker-resource-class.c | 124 ++--
src/tracker-store/tracker-resource-class.h | 10 +-
src/tracker-store/tracker-resources.c | 144 ++--
src/tracker-store/tracker-resources.h | 54 +-
src/tracker-store/tracker-statistics.c | 72 +-
src/tracker-store/tracker-statistics.h | 10 +-
src/tracker-store/tracker-store.c | 54 +-
src/tracker-store/tracker-store.h | 8 +-
src/tracker-store/tracker-writeback.c | 20 +-
src/tracker-store/tracker-writeback.h | 8 +-
src/tracker-utils/tracker-import.c | 50 +-
src/tracker-utils/tracker-info.c | 74 +-
src/tracker-utils/tracker-search.c | 564 ++++++++--------
src/tracker-utils/tracker-sparql.c | 152 ++--
src/tracker-utils/tracker-stats.c | 36 +-
src/tracker-utils/tracker-status.c | 228 +++---
src/tracker-utils/tracker-tag.c | 430 ++++++------
src/tracker-writeback/tracker-config.c | 136 ++--
src/tracker-writeback/tracker-config.h | 12 +-
src/tracker-writeback/tracker-main.c | 32 +-
src/tracker-writeback/tracker-writeback-consumer.c | 11 +-
.../tracker-writeback-dispatcher.c | 6 +-
src/tracker-writeback/tracker-writeback-mp3.c | 18 +-
src/tracker-writeback/tracker-writeback-xmp.c | 82 ++--
tests/Makefile.am | 2 +-
tests/common/tracker-test-helpers.c | 2 +-
tests/common/tracker-test-helpers.h | 4 +-
tests/functional-tests/tests.xml | 10 +-
tests/libtracker-common/Makefile.am | 8 +-
tests/libtracker-common/mock-dbus-gproxy.c | 4 +-
tests/libtracker-common/mock-dbus-gproxy.h | 4 +-
tests/libtracker-common/mock-thumbnailer-dbus.c | 46 +-
tests/libtracker-common/tracker-dbus-test.c | 10 +-
tests/libtracker-common/tracker-field-test.c | 8 +-
tests/libtracker-common/tracker-file-utils-test.c | 8 +-
tests/libtracker-common/tracker-type-utils-test.c | 50 +-
tests/libtracker-data/Makefile.am | 2 +
tests/libtracker-data/aggregates/Makefile.am | 11 +
tests/libtracker-data/aggregates/aggregate-1.out | 1 +
tests/libtracker-data/aggregates/aggregate-1.rq | 5 +
.../aggregates/aggregate-distinct-1.out | 1 +
.../aggregates/aggregate-distinct-1.rq | 4 +
.../aggregates/aggregate-group-1.out | 2 +
.../aggregates/aggregate-group-1.rq | 9 +
tests/libtracker-data/aggregates/data-1.ontology | 34 +
tests/libtracker-data/aggregates/data-1.ttl | 34 +
.../libtracker-data/algebra/filter-placement-1.rq | 6 +-
.../libtracker-data/algebra/filter-placement-2.rq | 6 +-
.../libtracker-data/algebra/filter-placement-3.rq | 4 +-
tests/libtracker-data/bnode-coreference/query.rq | 2 +-
tests/libtracker-data/dawg-testcases | 2 +-
tests/libtracker-data/expr-ops/query-ge-1.rq | 10 +-
tests/libtracker-data/expr-ops/query-le-1.rq | 8 +-
tests/libtracker-data/expr-ops/query-minus-1.rq | 12 +-
tests/libtracker-data/expr-ops/query-mul-1.rq | 10 +-
tests/libtracker-data/expr-ops/query-plus-1.rq | 10 +-
tests/libtracker-data/expr-ops/query-unminus-1.rq | 10 +-
tests/libtracker-data/expr-ops/query-unplus-1.rq | 10 +-
tests/libtracker-data/nmo/data-1.ttl | 2 +-
tests/libtracker-data/optional/q-opt-complex-1.rq | 14 +-
tests/libtracker-data/sort/query-sort-4.rq | 2 +-
tests/libtracker-data/sort/query-sort-5.rq | 6 +-
tests/libtracker-data/subqueries/Makefile.am | 8 +
tests/libtracker-data/subqueries/data-1.ontology | 31 +
tests/libtracker-data/subqueries/data-1.ttl | 28 +
tests/libtracker-data/subqueries/subqueries-1.out | 2 +
tests/libtracker-data/subqueries/subqueries-1.rq | 10 +
tests/libtracker-data/tracker-ontology-test.c | 14 +-
tests/libtracker-data/tracker-sparql-blank-test.c | 10 +-
tests/libtracker-data/tracker-sparql-test.c | 16 +-
tests/libtracker-data/turtle/turtle-query-001.rq | 4 +-
tests/libtracker-db/Makefile.am | 4 +-
tests/libtracker-db/tracker-db-dbus-test.c | 38 +-
tests/libtracker-db/tracker-db-manager-common.c | 4 +-
.../libtracker-db/tracker-db-manager-test-attach.c | 10 +-
.../libtracker-db/tracker-db-manager-test-custom.c | 10 +-
.../tracker-db-manager-test-unattach.c | 14 +-
tests/libtracker-fts/tracker-fts-test.c | 4 +-
tests/tracker-extract/data/avi/create_avi_testdata | 2 +-
.../tracker-extract-gstreamer-test.c | 20 +-
tests/tracker-extract/tracker-extract-jpeg-test.c | 24 +-
tests/tracker-extract/tracker-extract-mp3-test.c | 18 +-
tests/tracker-extract/tracker-extract-png-test.c | 16 +-
tests/tracker-extract/tracker-extract-test-utils.c | 50 +-
tests/tracker-extract/tracker-extract-test-utils.h | 14 +-
.../tracker-extract-testsuite-avi.c | 8 +-
.../tracker-extract-testsuite-jpeg.c | 38 +-
.../tracker-extract-testsuite-mp3.c | 56 +-
.../tracker-extract-testsuite-png.c | 18 +-
.../tracker-extract-testsuite-tiff.c | 24 +-
tests/tracker-extract/tracker-extract-tiff-test.c | 16 +-
tests/tracker-miner-fs/Makefile.am | 4 +-
.../tracker-miner-fs/tracker-metadata-utils-test.c | 14 +-
tests/tracker-store/tracker-events-test.c | 166 +++---
utils/Makefile.am | 3 +-
utils/data-generators/.gitignore | 1 +
utils/data-generators/README | 18 +-
utils/data-generators/barnum/README | 24 +-
utils/data-generators/barnum/convert_data.py | 12 +-
utils/data-generators/barnum/gen_data.py | 10 +-
utils/data-generators/barnum/gencc.py | 16 +-
utils/data-generators/barnum/genpw.py | 38 +-
utils/data-generators/generate-all-and-import.sh | 2 +-
.../generate-data-for-contact-messages.py | 44 +-
utils/data-generators/generate-data-for-gossip.py | 2 +-
utils/data-generators/generate-data-for-music.py | 54 +-
utils/data-generators/id32nmmTurtle.py | 344 +++++-----
utils/data-generators/id32ttl.py | 58 +-
utils/ontology/Makefile.am | 29 +
utils/ontology/generate-ontology.sh | 5 +
utils/ontology/ontology-graph.c | 488 +++++++++++++
utils/playlists/Makefile.am | 4 +-
utils/playlists/playlist2ttl.c | 107 ++--
utils/services/data-validator.c | 158 +++---
utils/services/file-class.cache.test | 2 +-
utils/services/gen-doc.sh | 12 +-
utils/services/ontology-validator.c | 282 ++++----
utils/services/qname-test.c | 152 ++--
utils/services/qname.c | 356 +++++-----
utils/services/qname.h | 2 +-
utils/services/rdfxml2metadatasample.xsl | 2 +-
utils/services/rdfxml2servicesample.xsl | 2 +-
utils/services/rdfxml2unittest_data.xsl | 2 +-
utils/services/rdfxml2unittest_query.xsl | 2 +-
utils/services/rdfxmlsample.xsl | 8 +-
utils/services/resources/LICENSE.txt | 2 +-
utils/services/resources/nie-maemo.css | 13 +
utils/services/sample.xsl | 4 +-
utils/services/service2rdf-xml.py | 2 +-
utils/services/ttl2graphviz.c | 70 +-
utils/services/ttl2html.c | 86 ++--
utils/services/ttl_graphviz.c | 106 ++--
utils/services/ttl_html.c | 454 +++++++------
utils/services/ttl_loader.c | 472 +++++++------
utils/services/ttl_model.c | 164 +++---
utils/services/ttl_model.h | 58 +-
utils/tracker-fts/tracker-fts-test.c | 56 +-
385 files changed, 14590 insertions(+), 13343 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
