[tracker/harmattan: 1863/2240] Merge branch 'master' into harmattan
- From: Martyn James Russell <mr src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [tracker/harmattan: 1863/2240] Merge branch 'master' into harmattan
- Date: Thu, 4 Feb 2010 17:21:09 +0000 (UTC)
commit b878ed7c6185ffff6f235e6b68ad258737583cd9
Merge: 6c79f33 7cdd786
Author: Martyn Russell <martyn lanedo com>
Date: Fri Dec 18 16:13:08 2009 +0000
Merge branch 'master' into harmattan
.gitignore | 2 +
INSTALL | 17 +-
Makefile.am | 23 +-
NEWS | 41 +
configure.ac | 148 +++-
data/ontologies/34-nmo.ontology | 33 +
data/ontologies/38-nmm.ontology | 2 +-
docs/Makefile.am | 7 +-
docs/reference/Makefile.am | 3 +-
docs/reference/ontology/Makefile.am | 45 +
docs/reference/ontology/ontology-docs.sgml | 71 ++
.../reference/ontology/ontology-sections.txt | 0
docs/reference/ontology/version.xml.in | 1 +
docs/tools/Makefile.am | 68 ++
docs/tools/gen-doc.sh | 33 +
.../ontology => docs/tools}/generate-ontology.sh | 0
{utils/ontology => docs/tools}/ontology-graph.c | 227 +++++-
{utils/services => docs/tools}/qname.c | 0
{utils/services => docs/tools}/qname.h | 0
utils/services/ttl2html.c => docs/tools/ttl2sgml.c | 4 +-
{utils/services => docs/tools}/ttl_loader.c | 0
{utils/services => docs/tools}/ttl_loader.h | 0
{utils/services => docs/tools}/ttl_model.c | 0
{utils/services => docs/tools}/ttl_model.h | 0
docs/tools/ttl_sgml.c | 363 ++++++++
utils/services/ttl_html.h => docs/tools/ttl_sgml.h | 6 +-
examples/Makefile.am | 3 +-
examples/libtracker-miner/tracker-main.c | 3 +-
examples/libtracker-miner/tracker-miner-test.c | 3 +-
examples/libtracker-miner/tracker-miner-test.h | 3 +-
.../rss_reader => examples/rss-reader}/Makefile.am | 0
{python/rss_reader => examples/rss-reader}/README | 0
.../rss-reader}/initial-data.ttl | 0
{python/rss_reader => examples/rss-reader}/main.py | 0
.../rss-reader}/rss_viewer.ui | 0
.../rss_reader => examples/rss-reader}/signaler.py | 0
.../rss-reader}/tracker_backend.py | 0
.../rss-reader}/zeitgeist_backend.py | 0
extensions/firefox-extension/Makefile | 53 --
extensions/firefox-extension/README | 34 -
extensions/firefox-extension/chrome.manifest | 7 -
.../chrome/content/beagleAddFilter.js | 11 -
.../chrome/content/beagleAddFilter.xul | 45 -
.../chrome/content/beagleOverlay.js | 709 ----------------
.../chrome/content/beagleOverlay.xul | 125 ---
.../chrome/content/beaglePrefs.js | 324 -------
.../chrome/content/beaglePrefs.xul | 141 ----
.../firefox-extension/chrome/content/contents.rdf | 34 -
.../firefox-extension/chrome/content/i18n.js | 54 --
.../chrome/content/indexBookmark.js | 207 -----
.../firefox-extension/chrome/content/indexLink.js | 338 --------
.../firefox-extension/chrome/content/indexLink.xul | 35 -
.../chrome/content/jslib/debug/debug.js | 156 ----
.../chrome/content/jslib/io/dir.js | 231 -----
.../chrome/content/jslib/io/dirUtils.js | 185 ----
.../chrome/content/jslib/io/file.js | 771 -----------------
.../chrome/content/jslib/io/fileUtils.js | 598 -------------
.../chrome/content/jslib/io/filesystem.js | 648 --------------
.../chrome/content/jslib/jslib.js | 264 ------
.../chrome/content/jslib/modules.js | 74 --
.../firefox-extension/chrome/content/json.js | 287 -------
extensions/firefox-extension/chrome/content/md5.js | 256 ------
.../firefox-extension/chrome/content/utils.js | 51 --
.../chrome/locale/en-US/beagle.dtd | 38 -
.../chrome/locale/en-US/beagle.properties | 22 -
.../chrome/locale/en-US/contents.rdf | 26 -
.../chrome/locale/fr-FR/beagle.dtd | 38 -
.../chrome/locale/fr-FR/beagle.properties | 22 -
.../chrome/locale/fr-FR/contents.rdf | 26 -
.../chrome/skin/classic/beagle-big.png | Bin 1527 -> 0 bytes
.../chrome/skin/classic/beagle-disabled.png | Bin 642 -> 0 bytes
.../chrome/skin/classic/beagle-error.png | Bin 611 -> 0 bytes
.../chrome/skin/classic/beagle.png | Bin 650 -> 0 bytes
.../chrome/skin/classic/contents.rdf | 17 -
.../chrome/skin/classic/overlay.css | 28 -
.../firefox-extension/firefox-extension-xesam.xpi | Bin 57382 -> 0 bytes
extensions/firefox-extension/install.rdf | 39 -
extensions/thunderbird-extension/Makefile | 48 --
extensions/thunderbird-extension/chrome.manifest | 5 -
.../components/TrackerCommandLine.js | 186 ----
.../components/TrackerIndexer.js | 97 ---
.../components/TrackerQueue.js | 97 ---
.../components/TrackerSettings.js | 97 ---
.../thunderbird-extension/content/contents.rdf | 34 -
.../thunderbird-extension/content/tracker.css | 12 -
.../thunderbird-extension/content/tracker.js | 122 ---
.../thunderbird-extension/content/tracker.xul | 60 --
.../content/trackerIndexer.js | 452 ----------
.../content/trackerMailWindow.xul | 397 ---------
.../content/trackerMessenger.xul | 187 ----
.../thunderbird-extension/content/trackerPrefs.xul | 332 --------
.../thunderbird-extension/content/trackerQueue.js | 256 ------
.../content/trackerService.js | 521 ------------
.../content/trackerSettings.js | 207 -----
.../content/trackerUnindex.js | 394 ---------
.../content/trackerUnindex.xul | 77 --
.../thunderbird-extension/content/trackerUtils.js | 32 -
.../defaults/preferences/default.js | 11 -
extensions/thunderbird-extension/install.rdf | 36 -
.../locale/en-US/contents.rdf | 23 -
.../locale/en-US/strings.properties | 16 -
.../thunderbird-extension/locale/en-US/tracker.dtd | 50 --
.../skin/classic/contents.rdf | 17 -
.../skin/classic/tracker-disabled.png | Bin 1166 -> 0 bytes
.../skin/classic/tracker-error.png | Bin 1166 -> 0 bytes
.../thunderbird-extension/skin/classic/tracker.png | Bin 1166 -> 0 bytes
extensions/thunderbird-extension/tracker.xpi | Bin 42433 -> 0 bytes
po/POTFILES.in | 16 +-
po/es.po | 178 +++--
python/FUSE/trackerfs.py | 279 ------
python/Makefile.am | 4 -
python/SearchTool/COPYING | 340 --------
python/SearchTool/README | 19 -
python/SearchTool/mainform.py | 191 -----
python/SearchTool/trackergui.py | 163 ----
python/applet/applet.py | 131 ---
python/applet/applet.svg | 453 ----------
python/nautilus/README | 15 -
python/nautilus/tracker-tags-tab.py | 195 -----
src/libtracker-common/Makefile.am | 2 +-
src/libtracker-common/tracker-class.c | 1 -
src/libtracker-common/tracker-class.h | 1 -
src/libtracker-common/tracker-common.h | 1 -
src/libtracker-common/tracker-config-file.c | 1 -
src/libtracker-common/tracker-config-file.h | 1 -
src/libtracker-common/tracker-dbus.c | 1 -
src/libtracker-common/tracker-dbus.h | 1 -
src/libtracker-common/tracker-file-utils.c | 1 -
src/libtracker-common/tracker-file-utils.h | 1 -
src/libtracker-common/tracker-ioprio.c | 1 -
src/libtracker-common/tracker-ioprio.h | 1 -
src/libtracker-common/tracker-keyfile-object.c | 1 -
src/libtracker-common/tracker-keyfile-object.h | 1 -
src/libtracker-common/tracker-language.c | 1 -
src/libtracker-common/tracker-language.h | 1 -
src/libtracker-common/tracker-log.c | 1 -
src/libtracker-common/tracker-log.h | 1 -
src/libtracker-common/tracker-namespace.c | 1 -
src/libtracker-common/tracker-namespace.h | 1 -
src/libtracker-common/tracker-ontology.c | 1 -
src/libtracker-common/tracker-ontology.h | 1 -
src/libtracker-common/tracker-os-dependant-unix.c | 1 -
src/libtracker-common/tracker-os-dependant-win.c | 1 -
src/libtracker-common/tracker-os-dependant.h | 1 -
src/libtracker-common/tracker-power-devicekit.c | 1 -
src/libtracker-common/tracker-power-hal.c | 1 -
src/libtracker-common/tracker-power.h | 1 -
src/libtracker-common/tracker-property.c | 1 -
src/libtracker-common/tracker-property.h | 1 -
src/libtracker-common/tracker-statement-list.c | 1 -
src/libtracker-common/tracker-statement-list.h | 1 -
src/libtracker-common/tracker-storage-hal.c | 1 -
src/libtracker-common/tracker-storage.h | 1 -
src/libtracker-common/tracker-type-utils.c | 1 -
src/libtracker-common/tracker-type-utils.h | 1 -
src/libtracker-common/tracker-utils.c | 1 -
src/libtracker-common/tracker-utils.h | 1 -
src/libtracker-data/Makefile.am | 2 +-
src/libtracker-data/tracker-data-backup.c | 1 -
src/libtracker-data/tracker-data-backup.h | 1 -
src/libtracker-data/tracker-data-manager.c | 1 -
src/libtracker-data/tracker-data-manager.h | 1 -
src/libtracker-data/tracker-data-query.c | 1 -
src/libtracker-data/tracker-data-query.h | 1 -
src/libtracker-data/tracker-data-update.c | 8 +-
src/libtracker-data/tracker-data-update.h | 1 -
src/libtracker-data/tracker-data.h | 1 -
src/libtracker-data/tracker-sparql-query.vala | 49 +-
src/libtracker-db/tracker-db-backup.c | 1 -
src/libtracker-db/tracker-db-backup.h | 1 -
src/libtracker-db/tracker-db-dbus.c | 1 -
src/libtracker-db/tracker-db-dbus.h | 1 -
src/libtracker-db/tracker-db-interface-sqlite.c | 3 +-
src/libtracker-db/tracker-db-interface-sqlite.h | 1 -
src/libtracker-db/tracker-db-interface.c | 1 -
src/libtracker-db/tracker-db-interface.h | 1 -
src/libtracker-db/tracker-db-journal.c | 1 -
src/libtracker-db/tracker-db-journal.h | 1 -
src/libtracker-db/tracker-db-manager.c | 6 +-
src/libtracker-db/tracker-db-manager.h | 1 -
src/libtracker-db/tracker-db.h | 1 -
src/libtracker-fts/tracker-fts-config.c | 1 -
src/libtracker-fts/tracker-fts-config.h | 1 -
src/libtracker-fts/tracker-parser.c | 1 -
src/libtracker-fts/tracker-parser.h | 1 -
src/libtracker-gtk/tracker-gtk.h | 5 +-
src/libtracker-gtk/tracker-keyword-store.c | 7 +-
src/libtracker-gtk/tracker-keyword-store.h | 7 +-
src/libtracker-gtk/tracker-metadata-tile.c | 3 +-
src/libtracker-gtk/tracker-metadata-tile.h | 3 +-
src/libtracker-gtk/tracker-tag-bar.c | 3 +-
src/libtracker-gtk/tracker-tag-bar.h | 3 +-
src/libtracker-gtk/tracker-ui.c | 6 +-
src/libtracker-gtk/tracker-ui.h | 6 +-
src/libtracker-gtk/tracker-utils.c | 6 +-
src/libtracker-gtk/tracker-utils.h | 6 +-
src/libtracker-miner/tracker-crawler.c | 1 -
src/libtracker-miner/tracker-crawler.h | 1 -
src/libtracker-miner/tracker-miner-dbus.h | 1 -
src/libtracker-miner/tracker-miner-fs.c | 1 -
src/libtracker-miner/tracker-miner-fs.h | 1 -
src/libtracker-miner/tracker-miner-manager.c | 1 -
src/libtracker-miner/tracker-miner-manager.h | 1 -
src/libtracker-miner/tracker-miner.c | 1 -
src/libtracker-miner/tracker-miner.h | 1 -
src/libtracker-miner/tracker-monitor.c | 1 -
src/libtracker-miner/tracker-monitor.h | 1 -
src/libtracker-miner/tracker-utils.c | 1 -
src/libtracker-miner/tracker-utils.h | 1 -
src/plugins/Makefile.am | 5 +-
.../plugins/deskbar}/Makefile.am | 0
.../plugins/deskbar}/tracker-handler-static.py | 0
.../plugins/deskbar}/tracker-handler.py | 0
.../plugins/deskbar}/tracker-module.py | 0
src/plugins/evolution/tracker-evolution-plugin.c | 1 -
src/plugins/evolution/tracker-evolution-plugin.h | 1 -
src/plugins/kmail/tracker-kmail-common.h | 1 -
src/plugins/kmail/tracker-kmail-registrar.c | 1 -
src/plugins/kmail/tracker-kmail-registrar.h | 1 -
src/plugins/nautilus/Makefile.am | 26 +
src/plugins/nautilus/tracker-tags-extension.c | 300 +++++++
src/plugins/nautilus/tracker-tags-utils.c | 200 +++++
src/plugins/nautilus/tracker-tags-utils.h | 38 +
src/plugins/nautilus/tracker-tags-view.c | 885 ++++++++++++++++++++
src/plugins/nautilus/tracker-tags-view.h | 52 ++
src/tracker-control/tracker-control.c | 1 -
src/tracker-extract/dummy.c | 1 -
src/tracker-extract/tracker-albumart-dummy.c | 1 -
src/tracker-extract/tracker-albumart-generic.h | 1 -
src/tracker-extract/tracker-albumart-pixbuf.c | 1 -
src/tracker-extract/tracker-albumart.c | 1 -
src/tracker-extract/tracker-albumart.h | 1 -
src/tracker-extract/tracker-config.c | 1 -
src/tracker-extract/tracker-config.h | 1 -
src/tracker-extract/tracker-dbus.c | 1 -
src/tracker-extract/tracker-dbus.h | 1 -
src/tracker-extract/tracker-exif.c | 3 +-
src/tracker-extract/tracker-extract-abw.c | 1 -
.../tracker-extract-gstreamer-helix.c | 1 -
src/tracker-extract/tracker-extract-gstreamer.c | 1 -
src/tracker-extract/tracker-extract-html.c | 1 -
src/tracker-extract/tracker-extract-imagemagick.c | 1 -
src/tracker-extract/tracker-extract-jpeg.c | 1 -
src/tracker-extract/tracker-extract-mockup.c | 1 -
src/tracker-extract/tracker-extract-mp3.c | 1 -
src/tracker-extract/tracker-extract-mplayer.c | 1 -
src/tracker-extract/tracker-extract-msoffice.c | 1 -
src/tracker-extract/tracker-extract-oasis.c | 1 -
src/tracker-extract/tracker-extract-pdf.c | 1 -
src/tracker-extract/tracker-extract-playlist.c | 1 -
src/tracker-extract/tracker-extract-png.c | 1 -
src/tracker-extract/tracker-extract-ps.c | 1 -
src/tracker-extract/tracker-extract-text.c | 1 -
src/tracker-extract/tracker-extract-tiff.c | 3 +-
src/tracker-extract/tracker-extract-totem.c | 1 -
src/tracker-extract/tracker-extract.c | 1 -
src/tracker-extract/tracker-extract.h | 1 -
src/tracker-extract/tracker-fts-config.c | 1 -
src/tracker-extract/tracker-fts-config.h | 1 -
src/tracker-extract/tracker-iptc.c | 1 -
src/tracker-extract/tracker-main.c | 1 -
src/tracker-extract/tracker-main.h | 1 -
src/tracker-extract/tracker-msword.h | 1 -
src/tracker-extract/tracker-topanalyzer.h | 1 -
src/tracker-extract/tracker-xmp.c | 3 +-
src/tracker-miner-fs/tracker-config.c | 1 -
src/tracker-miner-fs/tracker-config.h | 1 -
src/tracker-miner-fs/tracker-miner-applications.c | 1 -
src/tracker-miner-fs/tracker-miner-applications.h | 1 -
src/tracker-miner-fs/tracker-miner-files.c | 1 -
src/tracker-miner-fs/tracker-miner-files.h | 1 -
src/tracker-miner-fs/tracker-thumbnailer.c | 3 +-
src/tracker-miner-fs/tracker-thumbnailer.h | 1 -
src/tracker-miner-fs/tracker-volume-cleanup.c | 1 -
src/tracker-miner-fs/tracker-volume-cleanup.h | 1 -
src/tracker-preferences/Makefile.am | 2 +-
src/tracker-search-bar/tracker-aligned-window.c | 1 -
src/tracker-search-bar/tracker-aligned-window.h | 1 -
src/tracker-search-bar/tracker-applet.c | 1 -
src/tracker-search-bar/tracker-applet.h | 1 -
src/tracker-search-bar/tracker-results-window.c | 1 -
src/tracker-search-bar/tracker-results-window.h | 1 -
src/tracker-search-bar/tracker-utils.c | 1 -
src/tracker-search-bar/tracker-utils.h | 1 -
src/tracker-status-icon/tracker-icon-config.c | 1 -
src/tracker-status-icon/tracker-icon-config.h | 1 -
src/tracker-status-icon/tracker-main.c | 1 -
src/tracker-status-icon/tracker-status-icon.c | 1 -
src/tracker-status-icon/tracker-status-icon.h | 1 -
src/tracker-store/tracker-backup.c | 1 -
src/tracker-store/tracker-backup.h | 1 -
src/tracker-store/tracker-config.c | 1 -
src/tracker-store/tracker-config.h | 1 -
src/tracker-store/tracker-dbus.c | 1 -
src/tracker-store/tracker-dbus.h | 1 -
src/tracker-store/tracker-events.c | 1 -
src/tracker-store/tracker-events.h | 1 -
src/tracker-store/tracker-main.c | 3 +-
src/tracker-store/tracker-push-registrar.c | 1 -
src/tracker-store/tracker-push-registrar.h | 1 -
src/tracker-store/tracker-push.c | 1 -
src/tracker-store/tracker-push.h | 1 -
src/tracker-store/tracker-resource-class.c | 1 -
src/tracker-store/tracker-resource-class.h | 1 -
src/tracker-store/tracker-resources.c | 11 +-
src/tracker-store/tracker-resources.h | 1 -
src/tracker-store/tracker-statistics.c | 1 -
src/tracker-store/tracker-statistics.h | 1 -
src/tracker-store/tracker-store.c | 1 -
src/tracker-store/tracker-store.h | 1 -
src/tracker-store/tracker-writeback.c | 1 -
src/tracker-store/tracker-writeback.h | 1 -
src/tracker-utils/tracker-import.c | 1 -
src/tracker-utils/tracker-info.c | 1 -
src/tracker-utils/tracker-search.c | 1 -
src/tracker-utils/tracker-sparql.c | 1 -
src/tracker-utils/tracker-stats.c | 1 -
src/tracker-utils/tracker-status.c | 1 -
src/tracker-utils/tracker-tag.c | 1 -
src/tracker-writeback/tracker-config.c | 1 -
src/tracker-writeback/tracker-config.h | 1 -
src/tracker-writeback/tracker-main.c | 1 -
src/tracker-writeback/tracker-writeback-consumer.c | 1 -
src/tracker-writeback/tracker-writeback-consumer.h | 1 -
src/tracker-writeback/tracker-writeback-dbus.h | 1 -
.../tracker-writeback-dispatcher.c | 1 -
.../tracker-writeback-dispatcher.h | 1 -
src/tracker-writeback/tracker-writeback-file.c | 1 -
src/tracker-writeback/tracker-writeback-file.h | 1 -
src/tracker-writeback/tracker-writeback-module.c | 1 -
src/tracker-writeback/tracker-writeback-module.h | 1 -
src/tracker-writeback/tracker-writeback-mp3.c | 1 -
src/tracker-writeback/tracker-writeback-xmp.c | 1 -
src/tracker-writeback/tracker-writeback.c | 1 -
src/tracker-writeback/tracker-writeback.h | 1 -
tests/common/tracker-test-helpers.c | 1 -
tests/common/tracker-test-helpers.h | 1 -
tests/libtracker-common/mock-thumbnailer-dbus.c | 1 -
tests/libtracker-common/tracker-dbus-test.c | 1 -
tests/libtracker-common/tracker-file-utils-test.c | 1 -
tests/libtracker-common/tracker-type-utils-test.c | 1 -
tests/libtracker-data/tracker-ontology-test.c | 1 -
tests/libtracker-data/tracker-sparql-blank-test.c | 1 -
tests/libtracker-data/tracker-sparql-test.c | 1 -
tests/libtracker-db/tracker-db-dbus-test.c | 1 -
tests/libtracker-db/tracker-db-manager-common.c | 1 -
tests/libtracker-db/tracker-db-manager-common.h | 1 -
.../libtracker-db/tracker-db-manager-test-attach.c | 1 -
.../libtracker-db/tracker-db-manager-test-custom.c | 1 -
.../tracker-db-manager-test-unattach.c | 1 -
tests/libtracker-fts/tracker-fts-test.c | 1 -
.../tracker-extract-gstreamer-test.c | 1 -
tests/tracker-extract/tracker-extract-jpeg-test.c | 1 -
tests/tracker-extract/tracker-extract-mp3-test.c | 1 -
tests/tracker-extract/tracker-extract-png-test.c | 1 -
tests/tracker-extract/tracker-extract-test-utils.c | 1 -
tests/tracker-extract/tracker-extract-test-utils.h | 1 -
.../tracker-extract-testsuite-avi.c | 1 -
.../tracker-extract-testsuite-avi.h | 1 -
.../tracker-extract-testsuite-generic.c | 1 -
.../tracker-extract-testsuite-generic.h | 1 -
.../tracker-extract-testsuite-jpeg.c | 1 -
.../tracker-extract-testsuite-jpeg.h | 1 -
.../tracker-extract-testsuite-mp3.c | 1 -
.../tracker-extract-testsuite-mp3.h | 1 -
.../tracker-extract-testsuite-png.c | 1 -
.../tracker-extract-testsuite-png.h | 1 -
.../tracker-extract-testsuite-tiff.c | 1 -
.../tracker-extract-testsuite-tiff.h | 1 -
tests/tracker-extract/tracker-extract-tiff-test.c | 1 -
.../tracker-miner-fs/tracker-metadata-utils-test.c | 1 -
tests/tracker-store/tracker-events-test.c | 1 -
utils/Makefile.am | 6 +-
{python => utils}/gtk-sparql/Makefile.am | 7 +-
.../gtk-sparql/completion.py | 3 +-
.../gtk-sparql/completion_engine.py | 1 +
{python => utils}/gtk-sparql/gtk-sparql.py | 7 +-
{python => utils}/gtk-sparql/gtk-sparql.ui | 0
{python => utils}/gtk-sparql/store.py | 0
utils/lyrics/Makefile.am | 6 +
{python/music => utils/lyrics}/lyrics.py | 0
utils/ontology/Makefile.am | 29 -
utils/services/gen-doc.sh | 54 --
utils/services/ttl_html.c | 312 -------
utils/tracker-fts/tracker-fts-test.c | 1 -
385 files changed, 2744 insertions(+), 12309 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
