[tracker/harmattan: 370/2240] Merge branch 'master' into harmattan
- From: Martyn James Russell <mr src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [tracker/harmattan: 370/2240] Merge branch 'master' into harmattan
- Date: Thu, 4 Feb 2010 17:13:31 +0000 (UTC)
commit 9a8ccc8fad321e4fabb03f48726fe6f91818dc76
Merge: b406396 98f422e
Author: Jürg Billeter <j bitron ch>
Date: Wed Jul 15 16:36:46 2009 +0200
Merge branch 'master' into harmattan
configure.ac | 85 +-
data/Makefile.am | 31 +-
data/dbus/Makefile.am | 11 +-
...=> org.freedesktop.Tracker.Miner.FS.service.in} | 2 +-
data/dbus/org.freedesktop.Tracker.service.in | 2 +-
data/dbus/tracker-backup.xml | 4 +-
data/dbus/tracker-daemon.xml | 137 --
data/dbus/tracker-extract.xml | 2 +-
data/dbus/tracker-indexer.xml | 124 -
data/dbus/tracker-miner.xml | 12 +
data/dbus/tracker-resources.xml | 15 +-
data/dbus/tracker-search.xml | 27 -
data/dbus/tracker-statistics.xml | 39 +
data/ontologies/34-nmo.ontology | 14 +-
data/ontologies/35-ncal.ontology | 11 -
data/ontologies/38-nmm.ontology | 9 +
...esktop.in.in => tracker-miner-fs.desktop.in.in} | 11 +-
...d.desktop.in.in => tracker-store.desktop.in.in} | 11 +-
docs/manpages/Makefile.am | 8 +-
docs/manpages/tracker-applet.1 | 4 +-
docs/manpages/tracker-extract.1 | 40 +-
docs/manpages/tracker-import.1 | 31 +
docs/manpages/tracker-info.1 | 32 +-
docs/manpages/tracker-preferences.1 | 6 +-
docs/manpages/tracker-search-tool.1 | 4 +-
docs/manpages/tracker-search.1 | 50 +-
docs/manpages/tracker-sparql.1 | 142 ++
docs/manpages/tracker-stats.1 | 27 +-
docs/manpages/tracker-status.1 | 12 +-
docs/manpages/{trackerd.1 => tracker-store.1} | 18 +-
docs/manpages/tracker-tag.1 | 19 +-
docs/manpages/tracker.cfg.5 | 16 +-
.../libtracker-common/libtracker-common-docs.sgml | 2 -
.../libtracker-common-sections.txt | 11 -
docs/reference/libtracker-module/Makefile.am | 10 +-
.../libtracker-module/libtracker-module-docs.sgml | 2 +
.../libtracker-module-sections.txt | 15 -
.../libtracker-module/libtracker-module.types | 4 +-
.../tmpl/tracker-module-file.sgml | 1 +
.../tmpl/tracker-module-metadata-utils.sgml | 2 +
.../tmpl/tracker-module-metadata.sgml | 115 -
.../libtracker-module/writing-an-extractor.sgml | 2 +-
po/.gitignore | 1 +
po/ChangeLog | 2 +-
po/POTFILES.in | 12 +-
po/POTFILES.skip | 3 +-
po/ar.po | 32 +-
po/be.po | 44 +-
po/be latin po | 44 +-
po/ca.po | 44 +-
po/cs.po | 44 +-
po/da.po | 1345 +++++------
po/de.po | 32 +-
po/dz.po | 42 +-
po/el.po | 44 +-
po/en_GB.po | 44 +-
po/es.po | 616 +++---
po/fi.po | 44 +-
po/fr.po | 34 +-
po/gl.po | 28 +-
po/he.po | 44 +-
po/hu.po | 28 +-
po/it.po | 28 +-
po/ja.po | 42 +-
po/ko.po | 44 +-
po/lt.po | 44 +-
po/mk.po | 40 +-
po/nb.po | 34 +-
po/nl.po | 32 +-
po/oc.po | 42 +-
po/pl.po | 50 +-
po/pt.po | 34 +-
po/pt_BR.po | 38 +-
po/ru.po | 42 +-
po/sk.po | 38 +-
po/sl.po | 42 +-
po/sv.po | 601 +++---
po/th.po | 44 +-
po/zh_CN.po | 44 +-
python/deskbar-handler/tracker-handler.py | 2 +-
python/deskbar-handler/tracker-module.py | 2 +-
src/Makefile.am | 51 +-
src/libtracker-common/.gitignore | 2 +
src/libtracker-common/Makefile.am | 23 +-
src/libtracker-common/tracker-common.h | 1 +
src/libtracker-common/tracker-config.c | 353 ---
src/libtracker-common/tracker-config.h | 23 +-
src/libtracker-common/tracker-dbus.c | 4 +-
src/libtracker-common/tracker-nfs-lock.c | 197 --
src/libtracker-common/tracker-nfs-lock.h | 40 -
src/libtracker-common/tracker-sparql-builder.vala | 204 ++
src/libtracker-common/tracker-statement-list.c | 62 +-
src/libtracker-common/tracker-statement-list.h | 16 +-
.../tracker-status.c | 173 +--
.../tracker-status.h | 0
src/libtracker-common/tracker-thumbnailer.c | 2 +-
src/libtracker-common/tracker-type-utils.c | 251 +--
src/libtracker-common/tracker-utils.c | 23 +-
src/libtracker-common/tracker-utils.h | 1 -
src/libtracker-data/libtracker-data.vapi | 12 +-
src/libtracker-data/tracker-data-backup.c | 110 +-
src/libtracker-data/tracker-data-backup.h | 9 +-
src/libtracker-data/tracker-data-manager.c | 42 +-
src/libtracker-data/tracker-data-query.c | 1 -
src/libtracker-data/tracker-data-update.c | 359 ++--
src/libtracker-data/tracker-data-update.h | 25 +-
src/libtracker-data/tracker-sparql-query.vala | 25 +-
src/libtracker-data/tracker-turtle.c | 8 +
src/libtracker-data/tracker-turtle.h | 1 +
src/libtracker-db/tracker-db-interface.c | 9 +-
src/libtracker-db/tracker-db-manager.c | 23 +-
src/libtracker-db/tracker-db-manager.h | 3 +-
src/libtracker-gtk/tracker-keyword-store.c | 2 +-
src/libtracker-gtk/tracker-metadata-tile.c | 2 +-
src/libtracker-gtk/tracker-tag-bar.c | 2 +-
src/libtracker/Makefile.am | 17 +-
src/libtracker/tracker.c | 507 ++---
src/libtracker/tracker.h | 129 +-
src/plugins/Makefile.am | 4 -
src/plugins/evolution/Makefile.am | 23 -
src/plugins/evolution/tracker-evolution-indexer.c | 678 ------
src/plugins/evolution/tracker-evolution-indexer.h | 101 -
src/plugins/evolution/tracker-evolution-plugin.c | 99 +-
.../evolution/tracker-evolution-registrar.c | 678 +++++-
.../evolution/tracker-evolution-registrar.h | 2 +-
src/plugins/kmail/Makefile.am | 23 -
src/plugins/kmail/tracker-kmail-indexer.c | 477 ----
src/plugins/kmail/tracker-kmail-indexer.h | 101 -
src/plugins/kmail/tracker-kmail-registrar.c | 453 +++-
src/plugins/kmail/tracker-kmail-registrar.h | 2 +-
src/plugins/rss/Makefile.am | 70 -
src/plugins/rss/tracker-rss-common.h | 64 -
src/plugins/rss/tracker-rss-indexer.c | 347 ---
src/plugins/rss/tracker-rss-indexer.h | 101 -
src/plugins/rss/tracker-rss-registrar.c | 396 ----
src/plugins/rss/tracker-rss-registrar.h | 94 -
src/plugins/rss/tracker-rss-registrar.xml | 39 -
src/rasqal/rasqal.h | 4 +-
src/rasqal/rasqal.vapi | 12 +-
src/rasqal/sparql_lexer.l | 7 +-
src/rasqal/sparql_parser.y | 11 +-
src/tracker-applet/Makefile.am | 4 +-
src/tracker-applet/tracker-applet-prefs.glade | 326 ---
src/tracker-applet/tracker-applet-prefs.ui | 294 +++
src/tracker-applet/tracker-applet.c | 213 +-
src/tracker-explorer/.gitignore | 2 +
src/tracker-explorer/Makefile.am | 51 +
src/tracker-explorer/explorer.ui | 174 ++
src/tracker-explorer/explorer.vala | 356 +++
src/tracker-extract/tracker-extract-abw.c | 4 +-
src/tracker-extract/tracker-extract-albumart.c | 4 +-
.../tracker-extract-gstreamer-helix.c | 24 +-
src/tracker-extract/tracker-extract-gstreamer.c | 85 +-
src/tracker-extract/tracker-extract-html.c | 6 +-
src/tracker-extract/tracker-extract-imagemagick.c | 4 +-
src/tracker-extract/tracker-extract-jpeg.c | 6 +-
src/tracker-extract/tracker-extract-libxine.c | 17 +-
src/tracker-extract/tracker-extract-mockup.c | 4 +-
src/tracker-extract/tracker-extract-mp3.c | 56 +-
src/tracker-extract/tracker-extract-mplayer.c | 15 +-
src/tracker-extract/tracker-extract-msoffice.c | 12 +-
src/tracker-extract/tracker-extract-oasis.c | 10 +-
src/tracker-extract/tracker-extract-pdf.c | 4 +-
src/tracker-extract/tracker-extract-playlist.c | 6 +-
src/tracker-extract/tracker-extract-png.c | 6 +-
src/tracker-extract/tracker-extract-ps.c | 8 +-
src/tracker-extract/tracker-extract-tiff.c | 4 +-
src/tracker-extract/tracker-extract-totem.c | 12 +-
src/tracker-extract/tracker-extract-vorbis.c | 12 +-
src/tracker-extract/tracker-extract-xmp.c | 13 +-
src/tracker-extract/tracker-extract.c | 180 +-
src/tracker-extract/tracker-main.c | 14 +-
src/tracker-extract/tracker-main.h | 2 +-
src/tracker-extract/tracker-topanalyzer.cpp | 9 +-
src/tracker-extract/tracker-xmp.c | 98 +-
src/tracker-extract/tracker-xmp.h | 5 +-
src/tracker-fts/tracker-fts.c | 4 +
src/tracker-indexer/.gitignore | 1 -
src/tracker-indexer/tracker-indexer.h | 172 --
src/tracker-indexer/tracker-marshal.list | 3 -
.../tracker-module-metadata-private.h | 43 -
src/tracker-indexer/tracker-module-metadata.c | 321 ---
src/tracker-indexer/tracker-module-metadata.h | 81 -
src/tracker-indexer/tracker-push.c | 151 --
src/tracker-miner-fs/.gitignore | 1 +
.../Makefile.am | 38 +-
.../modules/Makefile.am | 0
.../modules/applications.c | 155 +-
.../modules/dummy.c | 8 +-
.../modules/evolution-common.c | 40 +-
.../modules/evolution-common.h | 2 +-
.../modules/evolution-imap.c | 72 +-
.../modules/evolution-imap.h | 2 +-
.../modules/evolution-pop.c | 74 +-
.../modules/evolution-pop.h | 2 +-
.../modules/evolution.c | 3 +-
.../modules/files.c | 21 +-
.../modules/gaim-conversations.c | 23 +-
.../tracker-crawler.c | 3 +-
.../tracker-crawler.h | 0
.../tracker-dbus.c | 2 +-
.../tracker-dbus.h | 0
.../tracker-indexer-module.c | 0
.../tracker-indexer-module.h | 0
.../tracker-indexer.c | 1025 ++-------
src/tracker-miner-fs/tracker-indexer.h | 116 +
.../tracker-main.c | 112 +-
.../tracker-marshal-main.c | 0
src/tracker-miner-fs/tracker-marshal.list | 7 +
src/tracker-miner-fs/tracker-miner.c | 182 ++
src/tracker-miner-fs/tracker-miner.h | 74 +
.../tracker-module-file.c | 17 +-
.../tracker-module-file.h | 6 +-
.../tracker-module-iteratable.c | 0
.../tracker-module-iteratable.h | 0
.../tracker-module-metadata-utils.c | 138 +-
.../tracker-module-metadata-utils.h | 7 +-
.../tracker-module.h | 1 -
.../tracker-monitor.c | 190 +--
.../tracker-monitor.h | 0
.../tracker-processor.c | 521 +----
src/tracker-miner-fs/tracker-processor.h | 66 +
.../tracker-removable-device.c | 85 +-
.../tracker-removable-device.h | 31 +-
src/tracker-preferences/Makefile.am | 6 +-
src/tracker-preferences/tracker-preferences.c | 201 +-
src/tracker-preferences/tracker-preferences.glade | 2384 --------------------
src/tracker-preferences/tracker-preferences.ui | 2210 ++++++++++++++++++
src/tracker-search-tool/Makefile.am | 4 +-
src/tracker-search-tool/sexy-icon-entry.c | 969 --------
src/tracker-search-tool/sexy-icon-entry.h | 100 -
.../tracker-search-tool-callbacks.c | 20 +
.../tracker-search-tool-callbacks.h | 8 +
src/tracker-search-tool/tracker-search-tool.c | 24 +-
src/tracker-store/.gitignore | 1 +
src/{trackerd => tracker-store}/Makefile.am | 44 +-
src/{trackerd => tracker-store}/mingw-compat.h | 0
src/tracker-store/tracker-backup.c | 183 ++
src/{trackerd => tracker-store}/tracker-backup.h | 0
src/tracker-store/tracker-dbus.c | 337 +++
src/{trackerd => tracker-store}/tracker-dbus.h | 5 +-
.../tracker-events.c | 2 +-
.../tracker-events.h | 0
src/{trackerd => tracker-store}/tracker-main.c | 234 +--
src/{trackerd => tracker-store}/tracker-main.h | 0
.../tracker-marshal-main.c | 0
src/tracker-store/tracker-marshal.list | 9 +
.../tracker-push-registrar.c | 0
.../tracker-push-registrar.h | 0
src/{trackerd => tracker-store}/tracker-push.c | 0
src/{trackerd => tracker-store}/tracker-push.h | 0
src/tracker-store/tracker-removable-device.c | 338 +++
.../tracker-removable-device.h} | 17 +-
.../tracker-resource-class.c | 120 +-
.../tracker-resource-class.h | 5 +-
.../tracker-resources.c | 318 ++-
.../tracker-resources.h | 11 +-
src/tracker-store/tracker-statistics.c | 338 +++
src/tracker-store/tracker-statistics.h | 62 +
src/tracker-store/tracker-store.c | 440 ++++
src/tracker-store/tracker-store.h | 68 +
.../tracker-volume-cleanup.c | 0
.../tracker-volume-cleanup.h | 0
src/tracker-utils/tracker-import.c | 58 +-
src/tracker-utils/tracker-info.c | 108 +-
src/tracker-utils/tracker-search.c | 24 +-
src/tracker-utils/tracker-sparql.c | 4 +-
src/tracker-utils/tracker-stats.c | 6 +-
src/tracker-utils/tracker-status.c | 7 +-
src/tracker-utils/tracker-tag.c | 4 +-
src/trackerd/.gitignore | 1 -
src/trackerd/tracker-backup.c | 137 --
src/trackerd/tracker-daemon.c | 796 -------
src/trackerd/tracker-daemon.h | 90 -
src/trackerd/tracker-dbus.c | 574 -----
src/trackerd/tracker-marshal.list | 13 -
src/trackerd/tracker-processor.h | 99 -
src/trackerd/tracker-search.c | 537 -----
src/trackerd/tracker-search.h | 69 -
src/trackerd/tracker-utils.c | 58 -
src/trackerd/tracker-utils.h | 40 -
tests/Makefile.am | 2 +-
tests/libtracker-common/.gitignore | 1 +
tests/libtracker-common/tracker-type-utils-test.c | 6 +-
tests/libtracker-data/tracker-ontology-test.c | 2 +-
tests/libtracker-data/tracker-sparql-test.c | 2 +-
.../.gitignore | 0
.../Makefile.am | 31 +-
.../tracker-events-test.c | 0
.../tracker-metadata-utils-test.c | 0
utils/Makefile.am | 1 +
utils/playlists/.gitignore | 1 +
utils/playlists/Makefile.am | 23 +
utils/playlists/playlist2ttl.c | 117 +
utils/services/.gitignore | 1 +
utils/webhistory/epiphany-history-to-ttl.py | 53 +
296 files changed, 11508 insertions(+), 17043 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
