[tracker: 67/67] Merge branch 'master' into parser

[Jürg Billeter <juergbi src gnome org>]

commit 69039351b462511b693e3ce9544f02f3e574e4e1
Merge: 94839da... 7fcd15c...
Author: Jürg Billeter <j bitron ch>
Date:   Fri Aug 14 16:07:12 2009 +0200

    Merge branch 'master' into parser

 data/dbus/tracker-resources-class.xml              |    1 +
 data/ontologies/11-rdf.ontology                    |    2 +-
 po/hu.po                                           |  635 ++++++++++----------
 src/libtracker-data/tracker-data-manager.c         |   17 +-
 src/libtracker-data/tracker-data-manager.h         |    7 +-
 src/libtracker-data/tracker-data-update.c          |   60 ++-
 src/libtracker-db/tracker-db-interface.c           |   19 +-
 src/plugins/evolution/tracker-evolution-plugin.c   |    6 +-
 .../evolution/tracker-evolution-registrar.c        |    6 +-
 src/plugins/kmail/tracker-kmail-registrar.c        |    6 +-
 src/tracker-extract/tracker-albumart.c             |    2 +-
 src/tracker-extract/tracker-config.c               |    6 +-
 src/tracker-extract/tracker-extract-jpeg.c         |    2 +
 src/tracker-extract/tracker-iptc.c                 |   10 +-
 src/tracker-extract/tracker-iptc.h                 |    2 +-
 src/tracker-extract/tracker-main.c                 |    1 +
 src/tracker-fts/tracker-fts-config.c               |    6 +-
 src/tracker-fts/tracker-fts.c                      |   46 +-
 src/tracker-miner-fs/tracker-config.c              |    6 +-
 src/tracker-miner-fs/tracker-dbus.c                |    4 +-
 src/tracker-miner-fs/tracker-removable-device.c    |   26 +-
 src/tracker-store/tracker-config.c                 |    6 +-
 src/tracker-store/tracker-events.c                 |   91 ++--
 src/tracker-store/tracker-events.h                 |    1 +
 src/tracker-store/tracker-marshal.list             |    1 +
 src/tracker-store/tracker-resource-class.c         |  135 ++++-
 src/tracker-store/tracker-resource-class.h         |    1 +
 src/tracker-store/tracker-resources.c              |   15 +-
 src/tracker-utils/tracker-processes.c              |    1 +
 src/tracker-utils/tracker-search.c                 |    4 +-
 src/tracker-utils/tracker-status.c                 |    2 +-
 31 files changed, 642 insertions(+), 485 deletions(-)
---