[tracker/harmattan: 931/2240] Merge branch 'master' into harmattan
- From: Martyn James Russell <mr src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [tracker/harmattan: 931/2240] Merge branch 'master' into harmattan
- Date: Thu, 4 Feb 2010 17:15:27 +0000 (UTC)
commit fb461a2dfb94c16d6b5b842218e5a11b69b46156
Merge: ebded33 2dea24a
Author: Jürg Billeter <j bitron ch>
Date: Mon Sep 7 18:57:45 2009 +0200
Merge branch 'master' into harmattan
INSTALL | 94 +-
configure.ac | 17 +-
data/Makefile.am | 18 +-
data/db/sqlite-tracker.sql | 6 -
data/dbus/Makefile.am | 23 +-
...desktop.Tracker1.Miner.Applications.service.in} | 2 +-
...rg.freedesktop.Tracker1.Miner.Files.service.in} | 2 +-
data/dbus/tracker-backup.xml | 6 +-
data/dbus/tracker-miner.xml | 48 +-
data/modules/Makefile.am | 11 -
data/modules/applications.module | 22 -
data/modules/evolution.module | 22 -
data/modules/files.module | 22 -
data/modules/gaim-conversations.module | 22 -
data/ontologies/20-dc.ontology | 2 -
data/ontologies/30-nie.ontology | 5 +-
data/ontologies/31-nao.ontology | 3 +-
data/ontologies/32-nco.ontology | 1 +
data/ontologies/33-nfo.ontology | 10 -
data/ontologies/34-nmo.ontology | 2 +-
data/ontologies/36-scal.ontology | 64 +-
data/{tracker-module.pc.in => tracker-miner.pc.in} | 6 +-
data/tracker-status-icon.desktop.in.in | 19 +
docs/manpages/Makefile.am | 6 +-
docs/manpages/tracker-extract.1 | 3 +
docs/manpages/tracker-extract.cfg.5 | 25 +
docs/manpages/tracker-fts.cfg.5 | 32 +
docs/manpages/tracker-miner-fs.1 | 39 +
docs/manpages/tracker-miner-fs.cfg.5 | 94 +
docs/manpages/tracker-store.1 | 17 +-
docs/manpages/tracker-store.cfg.5 | 29 +
docs/manpages/tracker.cfg.5 | 226 --
docs/reference/Makefile.am | 3 +-
.../libtracker-common-sections.txt | 4 -
docs/reference/libtracker-module/Makefile.am | 88 -
.../adding-categories-and-properties.sgml | 170 --
.../libtracker-module/libtracker-module-docs.sgml | 60 -
.../libtracker-module-sections.txt | 28 -
.../libtracker-module/libtracker-module.types | 4 -
docs/reference/libtracker-module/tmpl/.gitignore | 1 -
.../tmpl/tracker-module-file.sgml | 85 -
.../tmpl/tracker-module-iteratable.sgml | 45 -
.../tmpl/tracker-module-metadata-utils.sgml | 39 -
docs/reference/libtracker-module/version.xml.in | 1 -
.../libtracker-module/writing-an-extractor.sgml | 167 --
.../writing-an-indexer-module.sgml | 162 --
po/POTFILES.in | 6 +
po/POTFILES.skip | 1 +
po/de.po | 336 +--
po/es.po | 341 ++-
po/gl.po | 1644 ++++++++------
po/sv.po | 705 ++++--
src/Makefile.am | 6 +-
src/libstemmer/Makefile.am | 5 +-
src/libtracker-common/COPYING.LIB | 510 +++++
src/libtracker-common/Makefile.am | 2 -
src/libtracker-common/libtracker-common.vapi | 8 +-
src/libtracker-common/posix.vapi | 8 +-
src/libtracker-common/tracker-class.c | 53 +-
src/libtracker-common/tracker-class.h | 11 +-
src/libtracker-common/tracker-common.h | 9 +-
src/libtracker-common/tracker-config-file.c | 42 +-
src/libtracker-common/tracker-config-file.h | 10 +-
src/libtracker-common/tracker-dbus.c | 8 +-
src/libtracker-common/tracker-dbus.h | 8 +-
src/libtracker-common/tracker-file-utils.c | 8 +-
src/libtracker-common/tracker-file-utils.h | 8 +-
src/libtracker-common/tracker-ioprio.h | 8 +-
src/libtracker-common/tracker-keyfile-object.c | 36 +-
src/libtracker-common/tracker-keyfile-object.h | 8 +-
src/libtracker-common/tracker-language.c | 8 +-
src/libtracker-common/tracker-language.h | 8 +-
src/libtracker-common/tracker-log.c | 8 +-
src/libtracker-common/tracker-log.h | 8 +-
src/libtracker-common/tracker-module-config.c | 8 +-
src/libtracker-common/tracker-module-config.h | 8 +-
src/libtracker-common/tracker-namespace.c | 8 +-
src/libtracker-common/tracker-namespace.h | 8 +-
src/libtracker-common/tracker-ontology.c | 8 +-
src/libtracker-common/tracker-ontology.h | 8 +-
src/libtracker-common/tracker-os-dependant-unix.c | 8 +-
src/libtracker-common/tracker-os-dependant-win.c | 8 +-
src/libtracker-common/tracker-os-dependant.h | 8 +-
src/libtracker-common/tracker-parser.c | 579 +-----
src/libtracker-common/tracker-parser.h | 53 +-
src/libtracker-common/tracker-power-devicekit.c | 41 +-
src/libtracker-common/tracker-power-hal.c | 48 +-
src/libtracker-common/tracker-power.h | 21 +-
src/libtracker-common/tracker-property.c | 8 +-
src/libtracker-common/tracker-property.h | 8 +-
src/libtracker-common/tracker-sparql-builder.vala | 10 +-
src/libtracker-common/tracker-statement-list.c | 28 +-
src/libtracker-common/tracker-statement-list.h | 11 +-
src/libtracker-common/tracker-storage-hal.c | 8 +-
src/libtracker-common/tracker-storage.h | 8 +-
src/libtracker-common/tracker-turtle-writer.vala | 8 +-
src/libtracker-common/tracker-type-utils.c | 8 +-
src/libtracker-common/tracker-type-utils.h | 8 +-
src/libtracker-common/tracker-utils.c | 37 +-
src/libtracker-common/tracker-utils.h | 10 +-
src/libtracker-data/COPYING.LIB | 510 +++++
src/libtracker-data/libtracker-data.vapi | 8 +-
src/libtracker-data/tracker-data-backup.c | 235 ++-
src/libtracker-data/tracker-data-backup.h | 24 +-
src/libtracker-data/tracker-data-manager.c | 172 +-
src/libtracker-data/tracker-data-manager.h | 11 +-
src/libtracker-data/tracker-data-query.c | 397 +----
src/libtracker-data/tracker-data-query.h | 35 +-
src/libtracker-data/tracker-data-update.c | 520 +++--
src/libtracker-data/tracker-data-update.h | 12 +-
src/libtracker-data/tracker-sparql-query.vala | 32 +-
src/libtracker-data/tracker-sparql-scanner.vala | 8 +-
src/libtracker-data/tracker-turtle-reader.vala | 31 +-
src/libtracker-db/COPYING.LIB | 510 +++++
src/libtracker-db/Makefile.am | 15 +-
src/libtracker-db/libtracker-db.vapi | 8 +-
src/libtracker-db/tracker-db-backup.c | 338 +++
src/libtracker-db/tracker-db-backup.h | 52 +
src/libtracker-db/tracker-db-dbus.c | 8 +-
src/libtracker-db/tracker-db-dbus.h | 8 +-
src/libtracker-db/tracker-db-interface-sqlite.c | 398 +++-
src/libtracker-db/tracker-db-interface-sqlite.h | 26 +-
src/libtracker-db/tracker-db-interface.c | 112 +-
src/libtracker-db/tracker-db-interface.h | 59 +-
src/libtracker-db/tracker-db-journal.c | 166 ++
src/libtracker-db/tracker-db-journal.h | 47 +
src/libtracker-db/tracker-db-manager.c | 240 ++-
src/libtracker-db/tracker-db-manager.h | 22 +-
src/libtracker-miner/COPYING.LIB | 510 +++++
src/libtracker-miner/Makefile.am | 92 +
src/libtracker-miner/test/.gitignore | 1 +
src/libtracker-miner/test/Makefile.am | 36 +
src/libtracker-miner/test/tracker-main.c | 245 ++
.../test/tracker-miner-test.c} | 33 +-
src/libtracker-miner/test/tracker-miner-test.h | 53 +
src/libtracker-miner/tracker-crawler.c | 693 ++++++
src/libtracker-miner/tracker-crawler.h | 68 +
src/libtracker-miner/tracker-marshal.list | 8 +
src/libtracker-miner/tracker-miner-dbus.h | 57 +
src/libtracker-miner/tracker-miner-fs.c | 1503 +++++++++++++
src/libtracker-miner/tracker-miner-fs.h | 84 +
src/libtracker-miner/tracker-miner-manager.c | 525 +++++
src/libtracker-miner/tracker-miner-manager.h | 79 +
src/libtracker-miner/tracker-miner.c | 851 +++++++
src/libtracker-miner/tracker-miner.h | 97 +
.../tracker-monitor.c | 603 ++---
src/libtracker-miner/tracker-monitor.h | 77 +
src/libtracker-miner/tracker-utils.c | 35 +
src/libtracker-miner/tracker-utils.h | 35 +
src/tracker-applet/.gitignore | 1 +
src/tracker-applet/Makefile.am | 15 +-
src/tracker-applet/tracker-main.c | 74 +
src/tracker-applet/tracker-status-icon.c | 713 ++++++
src/tracker-applet/tracker-status-icon.h | 53 +
src/tracker-extract/Makefile.am | 9 +-
src/tracker-extract/tracker-exif.c | 386 ++++
src/tracker-extract/tracker-exif.h | 40 +
src/tracker-extract/tracker-extract-gstreamer.c | 30 +-
src/tracker-extract/tracker-extract-imagemagick.c | 16 +-
src/tracker-extract/tracker-extract-jpeg.c | 602 +++---
src/tracker-extract/tracker-extract-mp3.c | 1470 +++++++------
src/tracker-extract/tracker-extract-pdf.c | 258 ++-
src/tracker-extract/tracker-extract-png.c | 343 +++-
src/tracker-extract/tracker-extract-tiff.c | 770 ++++---
src/tracker-extract/tracker-extract-vorbis.c | 340 ++-
src/tracker-extract/tracker-extract-xmp.c | 111 +-
src/tracker-extract/tracker-iptc.c | 116 +-
src/tracker-extract/tracker-iptc.h | 31 +-
src/tracker-extract/tracker-xmp.c | 437 +++--
src/tracker-extract/tracker-xmp.h | 27 +-
src/tracker-fts/Makefile.am | 13 +-
src/tracker-fts/tracker-fts.c | 77 +-
src/tracker-fts/tracker-fts.h | 26 +-
src/tracker-miner-fs/Makefile.am | 51 +-
src/tracker-miner-fs/modules/Makefile.am | 79 -
src/tracker-miner-fs/modules/applications.c | 366 ---
src/tracker-miner-fs/modules/dummy.c | 210 --
src/tracker-miner-fs/modules/evolution-common.c | 132 --
src/tracker-miner-fs/modules/evolution-common.h | 62 -
src/tracker-miner-fs/modules/evolution-imap.c | 1218 ----------
src/tracker-miner-fs/modules/evolution-imap.h | 73 -
src/tracker-miner-fs/modules/evolution-pop.c | 563 -----
src/tracker-miner-fs/modules/evolution-pop.h | 70 -
src/tracker-miner-fs/modules/evolution.c | 146 --
src/tracker-miner-fs/modules/files.c | 221 --
src/tracker-miner-fs/modules/gaim-conversations.c | 159 --
src/tracker-miner-fs/tracker-config.c | 814 +++++---
src/tracker-miner-fs/tracker-config.h | 121 +-
src/tracker-miner-fs/tracker-crawler.c | 1237 ----------
src/tracker-miner-fs/tracker-crawler.h | 70 -
src/tracker-miner-fs/tracker-dbus.h | 6 +-
src/tracker-miner-fs/tracker-indexer-module.c | 140 --
src/tracker-miner-fs/tracker-indexer-module.h | 62 -
src/tracker-miner-fs/tracker-indexer.c | 2376 --------------------
src/tracker-miner-fs/tracker-indexer.h | 122 -
src/tracker-miner-fs/tracker-main.c | 221 +--
src/tracker-miner-fs/tracker-miner-applications.c | 482 ++++
src/tracker-miner-fs/tracker-miner-applications.h | 52 +
src/tracker-miner-fs/tracker-miner-files.c | 1014 +++++++++
src/tracker-miner-fs/tracker-miner-files.h | 56 +
src/tracker-miner-fs/tracker-miner.c | 182 --
src/tracker-miner-fs/tracker-miner.h | 74 -
src/tracker-miner-fs/tracker-module-file.c | 311 ---
src/tracker-miner-fs/tracker-module-file.h | 81 -
src/tracker-miner-fs/tracker-module-iteratable.c | 70 -
src/tracker-miner-fs/tracker-module-iteratable.h | 57 -
.../tracker-module-metadata-utils.c | 847 -------
.../tracker-module-metadata-utils.h | 44 -
src/tracker-miner-fs/tracker-module.h | 43 -
src/tracker-miner-fs/tracker-monitor.h | 77 -
src/tracker-miner-fs/tracker-processor.c | 1764 ---------------
src/tracker-miner-fs/tracker-processor.h | 66 -
src/tracker-miner-fs/tracker-removable-device.c | 574 -----
src/tracker-miner-fs/tracker-removable-device.h | 53 -
src/tracker-miner-fs/tracker-status.c | 1097 ---------
src/tracker-miner-fs/tracker-status.h | 96 -
src/tracker-miner-fs/tracker-thumbnailer.c | 1 -
src/tracker-miner-fs/tracker-thumbnailer.h | 10 +-
src/tracker-miner-fs/tracker-utils.h | 6 +-
src/tracker-miner-fs/tracker-volume-cleanup.h | 6 +-
src/tracker-store/tracker-backup.c | 98 +-
src/tracker-store/tracker-backup.h | 6 +-
src/tracker-store/tracker-main.c | 12 +-
src/tracker-store/tracker-removable-device.c | 336 ---
src/tracker-store/tracker-resources.c | 4 +
src/tracker-store/tracker-statistics.c | 23 +-
src/tracker-store/tracker-store.c | 136 ++-
src/tracker-store/tracker-store.h | 5 +-
src/tracker-utils/Makefile.am | 46 +-
src/tracker-utils/tracker-processes.c | 15 +-
src/tracker-utils/tracker-status.c | 1061 ++++++----
tests/estress/abstract_engine.py | 4 +-
tests/estress/abstract_text_engine.py | 6 +-
tests/estress/client.py | 6 +-
tests/libtracker-common/Makefile.am | 14 -
tests/libtracker-common/tracker-file-utils-test.c | 4 +-
tests/libtracker-common/tracker-parser-test.c | 193 --
tests/libtracker-common/tracker-type-utils-test.c | 14 +-
tests/libtracker-data/.gitignore | 1 +
tests/libtracker-data/Makefile.am | 3 +-
tests/libtracker-data/error/query-error-2.ttl | 3 +
tests/libtracker-data/regex/regex-data-01.ttl | 3 +
tests/libtracker-data/tracker-ontology-test.c | 216 +-
tests/libtracker-data/tracker-sparql-test.c | 238 +--
tests/libtracker-data/turtle/turtle-data-001.ttl | 5 +
tests/libtracker-data/turtle/turtle-data-002.ttl | 6 +
tests/tracker-miner-fs/Makefile.am | 10 -
utils/services/ontology-validator.c | 7 +-
utils/services/ttl_html.c | 4 +-
utils/services/ttl_loader.c | 10 +-
utils/services/ttl_model.c | 2 +-
utils/services/ttl_model.h | 2 +-
utils/tracker-fts/Makefile.am | 1 +
utils/tracker-fts/tracker-fts-test.c | 12 +-
254 files changed, 18991 insertions(+), 21278 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
