[tracker/harmattan: 1412/2240] Merge branch 'master' into harmattan

[Martyn James Russell <mr src gnome org>]

commit bcb86b6b47c355d2f92b5d54c78a86b36b9c1e66
Merge: 06bd5ef f82a218
Author: Martyn Russell <martyn lanedo com>
Date:   Fri Oct 30 16:59:23 2009 +0000

    Merge branch 'master' into harmattan

 NEWS                                               |  100 +
 configure.ac                                       |   48 +-
 data/ontologies/11-rdf.ontology                    |    5 +
 data/ontologies/30-nie.ontology                    |    1 +
 docs/manpages/Makefile.am                          |    2 +-
 .../{tracker-processes.1 => tracker-control.1}     |   35 +-
 docs/manpages/tracker-sparql.1                     |    8 +-
 docs/manpages/tracker-status-icon.1                |    4 +
 docs/manpages/tracker-status-icon.cfg.5            |   28 +
 po/LINGUAS                                         |    1 +
 po/POTFILES.in                                     |    4 +-
 po/ro.po                                           | 2640 ++++++++++++++++++++
 src/Makefile.am                                    |    1 +
 src/libtracker-common/Makefile.am                  |    4 +-
 src/libtracker-common/tracker-dbus.c               |   19 +
 src/libtracker-common/tracker-dbus.h               |    3 +
 src/libtracker-common/tracker-ioprio.c             |    2 -
 src/libtracker-common/tracker-log.c                |   53 +-
 src/libtracker-common/tracker-log.h                |   31 +-
 src/libtracker-common/tracker-type-utils.c         |    3 +-
 src/libtracker-data/Makefile.am                    |    4 +-
 src/libtracker-data/libtracker-data.vapi           |    2 +-
 src/libtracker-data/tracker-data-update.c          |  632 +++---
 src/libtracker-data/tracker-data-update.h          |    5 +-
 src/libtracker-data/tracker-sparql-query.vala      |   37 +-
 src/libtracker-db/tracker-db-interface-sqlite.c    |   14 +
 src/libtracker-db/tracker-db-interface.c           |    9 +
 src/libtracker-db/tracker-db-interface.h           |   10 +-
 src/libtracker-fts/tracker-fts.c                   |  145 +-
 src/libtracker-miner/tracker-crawler.h             |    8 +-
 src/libtracker-miner/tracker-miner-manager.c       |   10 +-
 src/libtracker-miner/tracker-miner.c               |    3 +-
 src/tracker-control/Makefile.am                    |   29 +
 src/tracker-control/tracker-control.c              |  457 ++++
 src/tracker-explorer/Makefile.am                   |   46 +-
 src/tracker-explorer/explorer.ui                   |  174 --
 src/tracker-explorer/tracker-explorer.ui           |  252 ++
 .../{explorer.vala => tracker-explorer.vala}       |    2 +-
 src/tracker-extract/Makefile.am                    |   11 +-
 src/tracker-extract/tracker-dbus.c                 |    5 +-
 src/tracker-extract/tracker-dbus.h                 |    2 +-
 src/tracker-extract/tracker-extract-mp3.c          |   70 +-
 src/tracker-extract/tracker-extract.c              |   71 +-
 src/tracker-extract/tracker-extract.h              |    3 +-
 src/tracker-extract/tracker-main.c                 |  181 +-
 src/tracker-extract/tracker-topanalyzer.cpp        |  281 ++-
 src/tracker-miner-fs/tracker-miner-files.c         |  106 +-
 src/tracker-preferences/Makefile.am                |    4 +-
 src/tracker-search-tool/tracker-metadata-tile.gs   |    2 +-
 src/tracker-store/tracker-resources.c              |   27 +-
 src/tracker-utils/Makefile.am                      |    4 -
 src/tracker-utils/tracker-processes.c              |  271 --
 src/tracker-utils/tracker-sparql.c                 |    6 +-
 src/tracker-utils/tracker-status.c                 |    4 +-
 54 files changed, 4650 insertions(+), 1229 deletions(-)
---