[tracker/harmattan: 1288/2240] Merge branch 'master' into harmattan
- From: Martyn James Russell <mr src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [tracker/harmattan: 1288/2240] Merge branch 'master' into harmattan
- Date: Thu, 4 Feb 2010 17:17:02 +0000 (UTC)
commit 546f24ada1a48b8871fa49cdf583f9f542445207
Merge: 0ae873e cef652e
Author: Martyn Russell <martyn lanedo com>
Date: Fri Oct 9 16:03:20 2009 +0100
Merge branch 'master' into harmattan
Makefile.am | 2 +-
NEWS | 106 +
README | 32 +-
configure.ac | 201 +-
data/ontologies/30-nie.ontology | 2 +-
data/ontologies/33-nfo.ontology | 14 +
data/ontologies/38-nmm.description | 3 +-
data/ontologies/38-nmm.ontology | 28 +-
data/ontologies/39-mto.description | 1 +
data/ontologies/89-mtp.ontology | 83 +
data/ontologies/Makefile.am | 1 +
data/tracker-miner.pc.in | 2 +-
docs/design/Makefile.am | 4 +-
docs/design/tracker-indexer.dia | Bin 6291 -> 0 bytes
docs/design/tracker-miner-fs.dia | Bin 0 -> 6598 bytes
docs/design/tracker-store.dia | Bin 0 -> 4860 bytes
docs/design/trackerd.dia | Bin 5393 -> 0 bytes
.../libtracker-common-sections.txt | 26 +-
.../libtracker-common/libtracker-common.types | 5 +
.../libtracker-miner/libtracker-miner-sections.txt | 2 +-
.../libtracker-miner/tmpl/tracker-miner-fs.sgml | 39 +-
.../libtracker-miner/tmpl/tracker-miner.sgml | 11 +-
extensions/firefox-extension/chrome.manifest | 1 +
extensions/firefox-extension/install.rdf | 8 +
filters/Makefile.am | 3 -
filters/application/Makefile.am | 28 -
filters/application/csv_filter | 23 -
filters/application/msword_filter | 20 -
filters/application/pdf_filter | 3 -
filters/application/tab-separated-values_filter | 23 -
filters/application/vnd.ms-excel_filter | 23 -
...oasis.opendocument.presentation-template_filter | 3 -
.../vnd.oasis.opendocument.presentation_filter | 3 -
....oasis.opendocument.spreadsheet-template_filter | 3 -
.../vnd.oasis.opendocument.spreadsheet_filter | 3 -
.../vnd.oasis.opendocument.text-template_filter | 3 -
.../application/vnd.oasis.opendocument.text_filter | 3 -
filters/application/vnd.stardivision.writer_filter | 3 -
.../application/vnd.sun.xml.calc.template_filter | 3 -
filters/application/vnd.sun.xml.calc_filter | 3 -
filters/application/vnd.sun.xml.draw_filter | 3 -
.../vnd.sun.xml.impress.template_filter | 3 -
filters/application/vnd.sun.xml.impress_filter | 3 -
.../application/vnd.sun.xml.writer.template_filter | 3 -
filters/application/vnd.sun.xml.writer_filter | 3 -
filters/application/x-abiword_filter | 17 -
filters/application/x-gnumeric_filter | 23 -
filters/text/Makefile.am | 15 -
filters/text/csv_filter | 23 -
filters/text/djvu_filter | 3 -
filters/text/html_filter | 15 -
filters/text/spreadsheet_filter | 23 -
filters/text/tab-separated-values_filter | 23 -
filters/text/x-comma-separated-values_filter | 23 -
filters/text/x-tex_filter | 5 -
filters/text/xml_filter | 17 -
po/Makevars | 6 +
po/et.po | 121 +-
po/fi.po | 2612 ++++++++++++--------
po/sl.po | 2154 ++++++++++++-----
src/libtracker-client/Makefile.am | 2 +-
src/libtracker-common/Makefile.am | 12 +-
src/libtracker-common/tracker-class.c | 46 +-
src/libtracker-common/tracker-class.h | 41 +-
src/libtracker-common/tracker-common.h | 18 +-
src/libtracker-common/tracker-config-file.c | 40 +-
src/libtracker-common/tracker-config-file.h | 23 +-
src/libtracker-common/tracker-dbus.c | 5 +-
src/libtracker-common/tracker-dbus.h | 61 +-
src/libtracker-common/tracker-file-utils.c | 12 +-
src/libtracker-common/tracker-file-utils.h | 16 +-
src/libtracker-common/tracker-ioprio.h | 7 +-
src/libtracker-common/tracker-keyfile-object.h | 12 +-
src/libtracker-common/tracker-language.c | 120 +-
src/libtracker-common/tracker-language.h | 8 +-
src/libtracker-common/tracker-log.c | 3 +-
src/libtracker-common/tracker-log.h | 3 +-
src/libtracker-common/tracker-module-config.c | 897 -------
src/libtracker-common/tracker-module-config.h | 61 -
src/libtracker-common/tracker-namespace.c | 21 +-
src/libtracker-common/tracker-namespace.h | 32 +-
src/libtracker-common/tracker-ontology.h | 30 +-
src/libtracker-common/tracker-os-dependant-unix.c | 2 +-
src/libtracker-common/tracker-os-dependant-win.c | 2 +-
src/libtracker-common/tracker-os-dependant.h | 12 +-
src/libtracker-common/tracker-power.h | 23 +-
src/libtracker-common/tracker-property.c | 89 +-
src/libtracker-common/tracker-property.h | 109 +-
src/libtracker-common/tracker-statement-list.c | 61 +-
src/libtracker-common/tracker-statement-list.h | 69 +-
src/libtracker-common/tracker-storage-hal.c | 137 +-
src/libtracker-common/tracker-storage.h | 45 +-
src/libtracker-common/tracker-type-utils.c | 2 +-
src/libtracker-common/tracker-type-utils.h | 2 +-
src/libtracker-common/tracker-utils.c | 50 +-
src/libtracker-common/tracker-utils.h | 10 +-
src/libtracker-data/Makefile.am | 2 +-
src/libtracker-data/tracker-data-update.c | 21 +-
src/libtracker-data/tracker-sparql-query.vala | 95 +-
src/libtracker-fts/tracker-parser.c | 13 +-
src/libtracker-gtk/Makefile.am | 4 +-
src/libtracker-miner/Makefile.am | 10 +-
src/libtracker-miner/tracker-crawler.c | 8 -
src/libtracker-miner/tracker-marshal.list | 1 +
src/libtracker-miner/tracker-miner-fs.c | 445 +++-
src/libtracker-miner/tracker-miner-fs.h | 39 +-
src/libtracker-miner/tracker-miner-manager.c | 54 +
src/libtracker-miner/tracker-miner-manager.h | 10 +
src/libtracker-miner/tracker-miner.c | 114 +-
src/libtracker-miner/tracker-miner.h | 24 +-
.../evolution/tracker-miner-emails.desktop.in | 4 +-
src/plugins/kmail/Makefile.am | 2 +-
src/plugins/kmail/tracker-kmail-common.h | 3 -
src/tracker-explorer/Makefile.am | 6 +-
src/tracker-extract/Makefile.am | 8 +-
src/tracker-extract/tracker-albumart.c | 10 +-
src/tracker-extract/tracker-extract-msoffice.c | 44 +-
src/tracker-extract/tracker-extract-oasis.c | 35 +
src/tracker-extract/tracker-extract-pdf.c | 39 +-
src/tracker-miner-fs/Makefile.am | 10 +-
src/tracker-miner-fs/tracker-main.c | 7 +
src/tracker-miner-fs/tracker-miner-applications.c | 14 +-
src/tracker-miner-fs/tracker-miner-files.c | 123 +-
src/tracker-preferences/Makefile.am | 18 +-
src/tracker-preferences/tracker-preferences.ui | 36 +-
src/tracker-search-bar/Makefile.am | 12 +-
src/tracker-search-bar/tracker-results-window.c | 2 +-
src/tracker-search-bar/tracker-search-bar.ui | 2 +-
src/tracker-search-tool/Makefile.am | 6 +-
src/tracker-status-icon/Makefile.am | 4 +-
src/tracker-store/Makefile.am | 10 +-
src/tracker-store/tracker-main.c | 5 +-
src/tracker-store/tracker-statistics.c | 2 -
src/tracker-utils/Makefile.am | 2 +-
src/tracker-utils/tracker-sparql.c | 4 +-
src/tracker-utils/tracker-tag.c | 103 +-
tests/libtracker-common/tracker-type-utils-test.c | 14 +
tests/libtracker-data/nie/filter-description-1.out | 6 +
138 files changed, 5280 insertions(+), 3990 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
