[tracker/harmattan: 1132/2240] Merge branch 'master' into harmattan
- From: Martyn James Russell <mr src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [tracker/harmattan: 1132/2240] Merge branch 'master' into harmattan
- Date: Thu, 4 Feb 2010 17:16:12 +0000 (UTC)
commit 6d335372b710a93944f288e4cb69f3d29b6ff468
Merge: 3954b9e 3629d6f
Author: Jürg Billeter <j bitron ch>
Date: Fri Sep 25 19:58:09 2009 +0200
Merge branch 'master' into harmattan
.gitignore | 1 -
AUTHORS | 13 +-
MAINTAINERS | 25 +-
NEWS | 79 +
README | 207 +--
autogen.sh | 2 +-
configure.ac | 83 +-
data/.gitignore | 1 +
data/Makefile.am | 2 +-
data/dbus/tracker-resources.xml | 16 -
data/miners/Makefile.am | 16 +
data/miners/tracker-miner-applications.desktop.in | 6 +
data/miners/tracker-miner-files.desktop.in | 6 +
data/ontologies/30-nie.ontology | 1 -
data/ontologies/33-nfo.description | 9 +
data/ontologies/38-nmm.ontology | 1 +
data/tracker-miner-fs.desktop.in.in | 2 +-
docs/manpages/Makefile.am | 36 +-
docs/manpages/tracker-extract.1 | 8 +-
docs/manpages/tracker-info.1 | 3 +-
docs/manpages/tracker-miner-fs.1 | 9 +-
docs/manpages/tracker-preferences.1 | 9 +-
docs/manpages/tracker-processes.1 | 48 +
docs/manpages/tracker-search-bar.1 | 23 +
docs/manpages/tracker-search.1 | 55 +-
docs/manpages/tracker-sparql.1 | 5 +-
docs/manpages/tracker-stats.1 | 4 +-
docs/manpages/tracker-status-icon.1 | 28 +-
docs/manpages/tracker-store.1 | 129 +-
docs/manpages/tracker-tag.1 | 65 +-
po/POTFILES.in | 41 +-
po/POTFILES.skip | 10 +-
po/ar.po | 2015 +++++++++------
po/en_GB.po | 2752 +++++++++++++-------
po/es.po | 454 ++--
po/hu.po | 1391 ++++++-----
po/sv.po | 1048 ++++----
python/gtk-sparql/gtk-sparql.ui | 20 +-
src/Makefile.am | 23 +-
src/libstemmer/modules.h | 5 +
src/libtracker-client/tracker.c | 484 ++++-
src/libtracker-client/tracker.h | 41 +-
src/libtracker-common/Makefile.am | 8 +-
src/libtracker-common/tracker-power-hal.c | 2 +-
src/libtracker-common/tracker-sparql-builder.vala | 8 +-
src/libtracker-common/tracker-storage-hal.c | 2 +-
src/libtracker-common/tracker-turtle-writer.vala | 2 +-
src/libtracker-common/tracker-utils.c | 32 +-
src/libtracker-data/Makefile.am | 6 +
src/libtracker-data/tracker-sparql-query.vala | 109 +-
src/libtracker-miner/Makefile.am | 1 +
src/libtracker-miner/tracker-crawler.c | 29 +
src/libtracker-miner/tracker-crawler.h | 6 +
src/libtracker-miner/tracker-miner-fs.c | 126 +-
src/libtracker-miner/tracker-miner-fs.h | 3 +
src/libtracker-miner/tracker-miner-manager.c | 154 +-
src/libtracker-miner/tracker-miner-manager.h | 3 +
src/libtracker-miner/tracker-miner.c | 78 +-
src/plugins/evolution/Makefile.am | 52 +-
.../org.freedesktop.Tracker1.Miner.EMails.service | 2 +
src/plugins/evolution/tracker-evolution-common.h | 79 -
src/plugins/evolution/tracker-evolution-plugin.c | 1655 +++++++-----
src/plugins/evolution/tracker-evolution-plugin.h | 11 +-
src/plugins/evolution/tracker-evolution-plugin.xml | 11 -
.../evolution/tracker-evolution-registrar.c | 902 -------
.../evolution/tracker-evolution-registrar.h | 94 -
.../evolution/tracker-evolution-registrar.xml | 39 -
.../evolution/tracker-miner-emails.desktop.in | 6 +
src/plugins/kmail/tracker-kmail-registrar.c | 12 +-
src/tracker-explorer/Makefile.am | 3 +-
src/tracker-explorer/explorer.vala | 2 -
src/tracker-extract/tracker-albumart.c | 4 +-
src/tracker-extract/tracker-dbus.c | 10 +-
src/tracker-extract/tracker-extract-mp3.c | 35 +-
src/tracker-extract/tracker-extract-pdf.c | 5 +-
src/tracker-extract/tracker-extract-text.c | 5 +-
src/tracker-extract/tracker-extract.c | 4 +-
src/tracker-fts/tracker-fts.c | 6 +-
src/tracker-miner-fs/tracker-dbus.c | 14 +-
src/tracker-miner-fs/tracker-main.c | 4 +-
src/tracker-miner-fs/tracker-miner-files.c | 35 +-
src/tracker-miner-fs/tracker-thumbnailer.c | 2 +-
src/tracker-preferences/.gitignore | 1 +
src/tracker-preferences/Makefile.am | 9 +-
src/tracker-preferences/tracker-preferences.ui | 317 +--
src/tracker-preferences/tracker-preferences.vala | 4 +-
src/tracker-search-bar/.gitignore | 3 +
.../GNOME_Search_Bar_Applet.server.in.in | 24 +
src/tracker-search-bar/GNOME_Search_Bar_Applet.xml | 7 +
src/tracker-search-bar/Makefile.am | 53 +
src/tracker-search-bar/tracker-aligned-window.c | 337 +++
src/tracker-search-bar/tracker-aligned-window.h | 57 +
src/tracker-search-bar/tracker-applet.c | 285 ++
src/tracker-search-bar/tracker-applet.h | 43 +
src/tracker-search-bar/tracker-results-window.c | 1017 ++++++++
src/tracker-search-bar/tracker-results-window.h | 56 +
src/tracker-search-bar/tracker-search-bar.ui | 85 +
src/tracker-search-tool/.gitignore | 2 +
src/tracker-search-tool/Makefile.am | 76 +-
src/tracker-search-tool/tracker-category-view.gs | 112 +
src/tracker-search-tool/tracker-entry.gs | 54 +
src/tracker-search-tool/tracker-metadata-tile.gs | 213 ++
src/tracker-search-tool/tracker-query.gs | 94 +
src/tracker-search-tool/tracker-result-grid.gs | 174 ++
.../tracker-search-tool-callbacks.c | 1699 ------------
.../tracker-search-tool-callbacks.h | 213 --
.../tracker-search-tool-support.c | 1524 -----------
.../tracker-search-tool-support.h | 180 --
src/tracker-search-tool/tracker-search-tool.c | 2344 -----------------
src/tracker-search-tool/tracker-search-tool.gs | 86 +
src/tracker-search-tool/tracker-search-tool.h | 300 ---
src/tracker-search-tool/tracker-utils.gs | 147 ++
src/tracker-search-tool/tst.ui | 132 +
src/tracker-status-icon/.gitignore | 1 +
src/tracker-status-icon/tracker-main.c | 3 +-
src/tracker-status-icon/tracker-status-icon.c | 88 +-
src/tracker-store/tracker-backup.c | 4 +-
src/tracker-store/tracker-dbus.c | 14 +-
src/tracker-store/tracker-main.c | 2 +-
src/tracker-store/tracker-push.c | 2 +-
src/tracker-store/tracker-resources.c | 67 +-
src/tracker-store/tracker-resources.h | 12 -
src/tracker-utils/tracker-import.c | 2 +-
src/tracker-utils/tracker-info.c | 10 +-
src/tracker-utils/tracker-processes.c | 8 +-
src/tracker-utils/tracker-search.c | 578 +++--
src/tracker-utils/tracker-sparql.c | 18 +-
src/tracker-utils/tracker-stats.c | 2 +-
src/tracker-utils/tracker-status.c | 12 +-
src/tracker-utils/tracker-tag.c | 825 ++++---
utils/services/Makefile.am | 21 +-
utils/services/qname.c | 109 +
utils/services/qname.h | 19 +
utils/services/ttl2graphviz.c | 87 +
utils/services/ttl_graphviz.c | 82 +
utils/services/ttl_graphviz.h | 18 +
utils/services/ttl_html.c | 80 +-
utils/services/ttl_loader.c | 4 +-
138 files changed, 11802 insertions(+), 12651 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
