[tracker/harmattan-pre-signal-updates: 257/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: 257/1380] Merge branch 'master' into harmattan
- Date: Wed, 22 Sep 2010 15:29:09 +0000 (UTC)
commit 61a227e3b8bd1ae14cd009c89016d2cbd48562f7
Merge: 504e298 5c609d5
Author: Martyn Russell <martyn lanedo com>
Date: Thu May 20 18:14:53 2010 +0100
Merge branch 'master' into harmattan
Makefile.am | 4 +-
NEWS | 72 ++
configure.ac | 300 ++++-
data/.gitignore | 2 +
data/Makefile.am | 43 +-
data/dbus/Makefile.am | 30 +-
...rg.freedesktop.Tracker1.Miner.EMails.service.in | 0
data/miners/Makefile.am | 7 +-
.../miners/tracker-miner-evolution.desktop.in | 0
...sktop.in.in => tracker-miner-flickr.desktop.in} | 0
data/ontologies/11-rdf.ontology | 7 +-
data/ontologies/34-nmo.ontology | 3 +-
data/ontologies/40-mlo.ontology | 17 +-
data/ontologies/91-maemo.ontology | 21 +
data/ontologies/Indices.list | 2 +
data/ontologies/Makefile.am | 41 +-
data/tracker-miner-flickr.desktop.in.in | 18 +
data/tracker-miner-fs.desktop.in.in | 4 +-
data/tracker-miner-rss.desktop.in.in | 21 +-
data/tracker-status-icon.desktop.in.in | 4 +-
data/tracker-store.desktop.in.in | 4 +-
docs/manpages/Makefile.am | 8 +-
docs/manpages/tracker-extract.cfg.5 | 3 +
docs/manpages/tracker-fts.cfg.5 | 8 +
docs/ontologies/README.ontologiesdoc | 9 +-
docs/reference/libtracker-client/Makefile.am | 8 +-
docs/reference/libtracker-common/Makefile.am | 5 +-
.../libtracker-common-sections.txt | 3 +-
docs/reference/libtracker-extract/Makefile.am | 5 +-
.../libtracker-extract-sections.txt | 2 +
docs/reference/libtracker-miner/Makefile.am | 5 +-
.../libtracker-miner/libtracker-miner-docs.sgml | 2 +
.../libtracker-miner/libtracker-miner-sections.txt | 17 +-
docs/reference/ontology/Makefile.am | 122 ++-
docs/tools/Makefile.am | 51 +-
docs/tools/gen-doc.sh | 19 +-
examples/libtracker-extract/Makefile.am | 2 +
examples/libtracker-miner/Makefile.am | 2 +
po/POTFILES.in | 3 +-
po/POTFILES.skip | 3 +-
po/cs.po | 403 ++++---
po/de.po | 507 +++++----
po/es.po | 366 ++++---
po/nb.po | 1201 +++++++++++---------
po/sl.po | 370 ++++---
src/libtracker-client/Makefile.am | 3 +-
src/libtracker-common/tracker-language.c | 26 +-
src/libtracker-common/tracker-language.h | 2 +
src/libtracker-common/tracker-os-dependant-unix.c | 8 +-
src/libtracker-common/tracker-os-dependant-win.c | 8 +-
src/libtracker-common/tracker-utils.c | 48 +
src/libtracker-common/tracker-utils.h | 19 +-
src/libtracker-data/Makefile.am | 8 +-
src/libtracker-data/tracker-data-manager.c | 137 ++-
src/libtracker-data/tracker-data-update.c | 4 +-
src/libtracker-data/tracker-property.c | 37 +
src/libtracker-data/tracker-property.h | 3 +
src/libtracker-data/tracker-sparql-expression.vala | 94 +-
src/libtracker-data/tracker-sparql-pattern.vala | 109 ++-
src/libtracker-data/tracker-sparql-query.vala | 37 +-
src/libtracker-extract/Makefile.am | 1 +
src/libtracker-extract/tracker-utils.c | 127 ++-
src/libtracker-extract/tracker-utils.h | 10 +-
src/libtracker-fts/Makefile.am | 37 +-
src/libtracker-fts/tracker-fts-config.c | 116 ++-
src/libtracker-fts/tracker-fts-config.h | 6 +
src/libtracker-fts/tracker-fts.c | 45 +-
.../{tracker-parser.c => tracker-parser-glib.c} | 135 +--
src/libtracker-fts/tracker-parser-libicu.c | 664 +++++++++++
src/libtracker-fts/tracker-parser-libunistring.c | 499 ++++++++
src/libtracker-fts/tracker-parser-utils.c | 239 ++++
src/libtracker-fts/tracker-parser-utils.h | 77 ++
src/libtracker-fts/tracker-parser.h | 14 +-
src/libtracker-miner/Makefile.am | 20 +-
src/libtracker-miner/tracker-miner-fs.c | 91 ++-
src/libtracker-miner/tracker-miner.h | 1 +
src/libtracker-miner/tracker-miner.vapi | 16 +
.../tracker-network-provider-dummy.c | 168 +++
.../tracker-network-provider-network-manager.c | 321 ++++++
src/libtracker-miner/tracker-network-provider.c | 145 +++
src/libtracker-miner/tracker-network-provider.h | 103 ++
src/miners/Makefile.am | 2 +-
src/miners/flickr/.gitignore | 2 +
src/miners/flickr/Makefile.am | 4 +-
src/miners/fs/Makefile.am | 4 +-
src/miners/fs/tracker-config.c | 7 +-
src/miners/rss/.gitignore | 1 +
src/miners/rss/Makefile.am | 2 +
src/plugins/Makefile.am | 4 +-
src/plugins/evolution/Makefile.am | 19 +-
src/plugins/kmail/Makefile.am | 2 +
src/plugins/nautilus/Makefile.am | 2 +
src/tracker-control/Makefile.am | 2 +
src/tracker-extract/Makefile.am | 22 +-
src/tracker-extract/tracker-albumart-quill.cpp | 56 +-
src/tracker-extract/tracker-albumart.c | 8 +-
src/tracker-extract/tracker-config.c | 61 +-
src/tracker-extract/tracker-config.h | 4 +
src/tracker-extract/tracker-extract-gif.c | 492 ++++++++
src/tracker-extract/tracker-extract-gstreamer.c | 49 +-
src/tracker-extract/tracker-extract-html.c | 43 +-
src/tracker-extract/tracker-extract-jpeg.c | 4 +-
src/tracker-extract/tracker-extract-mp3.c | 12 +-
src/tracker-extract/tracker-extract-msoffice.c | 176 +---
src/tracker-extract/tracker-extract-oasis.c | 92 +--
src/tracker-extract/tracker-extract-pdf.cpp | 42 +-
src/tracker-extract/tracker-extract-text.c | 233 +----
src/tracker-extract/tracker-fts-config.c | 429 -------
src/tracker-extract/tracker-fts-config.h | 64 -
src/tracker-extract/tracker-main.c | 17 +-
src/tracker-extract/tracker-main.h | 6 +-
src/tracker-extract/tracker-read.c | 279 +++++
src/tracker-extract/tracker-read.h | 39 +
src/tracker-preferences/Makefile.am | 1 +
src/tracker-preferences/config.vapi | 1 +
src/tracker-preferences/tracker-preferences.vala | 11 +
src/tracker-search-bar/Makefile.am | 2 +
src/tracker-search-tool/Makefile.am | 2 +-
src/tracker-search-tool/tracker-category-view.gs | 7 +-
src/tracker-search-tool/tracker-entry.gs | 111 ++-
src/tracker-search-tool/tracker-metadata-tile.gs | 2 +-
src/tracker-search-tool/tracker-query.gs | 7 +-
src/tracker-search-tool/tracker-search-tool.gs | 21 +-
src/tracker-search-tool/tst.ui | 1 +
src/tracker-status-icon/Makefile.am | 2 +
src/tracker-status-icon/tracker-status-icon.c | 77 +-
src/tracker-store/Makefile.am | 2 +
src/tracker-store/tracker-statistics.c | 2 +-
src/tracker-store/tracker-store.c | 118 +--
src/tracker-store/tracker-store.h | 1 +
src/tracker-utils/Makefile.am | 2 +
src/tracker-writeback/Makefile.am | 2 +
tests/functional-tests/.gitignore | 3 +
tests/functional-tests/Makefile.am | 21 +-
...d-batch.sh => force-sqlite-misused-batch.sh.in} | 2 +-
...qlite-misused.sh => force-sqlite-misused.sh.in} | 2 +-
...{helper-test-data.sh => helper-test-data.sh.in} | 6 +-
tests/libtracker-data/Makefile.am | 2 +
.../libtracker-data/algebra/two-nested-opt-alt.rq | 2 +-
tests/libtracker-data/algebra/two-nested-opt.rq | 2 +-
tests/libtracker-data/nie/filter-identifier-1.out | 15 +
tests/libtracker-data/subqueries/Makefile.am | 5 +-
.../subqueries/subqueries-union-2.out | 5 +
.../subqueries/subqueries-union-2.rq | 14 +
tests/libtracker-data/tracker-sparql-test.c | 1 +
tests/libtracker-extract/Makefile.am | 2 +
tests/libtracker-extract/tracker-utils-test.c | 126 ++-
tests/libtracker-fts/Makefile.am | 23 +-
tests/libtracker-fts/tracker-parser-test.c | 334 ++++++
tests/libtracker-fts/tracker-parser.c | 272 +++++
tests/libtracker-miner/Makefile.am | 8 +-
tests/libtracker-miner/tracker-monitor-test.c | 462 --------
tests/tracker-miner-fs/Makefile.am | 2 +-
utils/data-generators/{ => deprecated}/README | 0
utils/data-generators/{ => deprecated}/atom2ttl.py | 0
.../data-generators/{ => deprecated}/bookmarks.in | 0
.../{ => deprecated}/generate-all-and-import.sh | 0
.../{ => deprecated}/generate-all.sh | 0
.../generate-data-for-bookmarks.py | 0
.../generate-data-for-contact-messages.py | 0
.../{ => deprecated}/generate-data-for-gossip.py | 0
.../{ => deprecated}/generate-data-for-music.py | 0
.../generate-data-for-webhistory.py | 0
.../{ => deprecated}/generate-name.py | 0
.../{ => deprecated}/generate_Image.py | 0
.../{ => deprecated}/generate_Video.py | 0
.../{ => deprecated}/get-fresh-planets.sh | 0
.../{ => deprecated}/id32nmmTurtle.py | 0
utils/data-generators/{ => deprecated}/id32ttl.py | 0
.../{ => deprecated}/internals/__init__.py | 0
.../{ => deprecated}/internals/id3reader.py | 0
.../{ => deprecated}/internals/tools.py | 0
.../data-generators/{ => deprecated}/songlist.ttl | 0
utils/services/Makefile.am | 3 +-
174 files changed, 7526 insertions(+), 3439 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
