[tracker/harmattan-pre-signal-updates: 61/1380] Merge branch 'master' into harmattan

[Martyn James Russell <mr src gnome org>]

commit f70e30028aa5d83a0354ef1ea34141a32ad039c8
Merge: 5903f27 a5a8668
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Apr 29 18:20:00 2010 +0100

    Merge branch 'master' into harmattan

 Makefile.am                                        |    5 +-
 NEWS                                               |   88 ++
 configure.ac                                       |   86 +-
 data/dbus/Makefile.am                              |    4 +
 ...rg.freedesktop.Tracker1.Miner.Flickr.service.in |    3 +
 data/icons/scalable/Makefile.am                    |   11 +-
 data/icons/scalable/tracker-miner-flickr.svg       |  206 ++++
 data/miners/Makefile.am                            |   16 +-
 data/miners/tracker-miner-flickr.desktop.in.in     |    8 +
 data/ontologies/31-nao.ontology                    |    2 +
 data/ontologies/32-nco.ontology                    |    7 +
 data/ontologies/40-mlo.ontology                    |    5 +-
 data/ontologies/Indices.list                       |    5 +
 data/tracker-miner-fs.desktop.in.in                |    2 +-
 data/tracker-status-icon.desktop.in.in             |    2 +-
 data/tracker-store.desktop.in.in                   |    2 +-
 docs/design/Makefile.am                            |    5 +-
 docs/design/tracker-structural-view.dot            |   79 ++
 docs/manpages/tracker-extract.1                    |    5 +-
 docs/manpages/tracker-search-tool.1                |   52 +-
 po/POTFILES.in                                     |    1 +
 po/cs.po                                           |  241 +++--
 po/sl.po                                           |  155 ++--
 src/libinotify/inotify-monitor.c                   |    9 +-
 src/libstemmer/stem_UTF_8_english.c                |   10 +-
 src/libtracker-common/Makefile.am                  |   11 +-
 src/libtracker-common/tracker-power-hal.c          |   39 +-
 ...er-power-devicekit.c => tracker-power-upower.c} |   61 +-
 src/libtracker-common/tracker-power.h              |    1 -
 src/libtracker-data/tracker-data-manager.c         |   17 +-
 src/libtracker-data/tracker-data-query.c           |   23 +-
 src/libtracker-data/tracker-data-query.h           |   11 +-
 src/libtracker-data/tracker-data-update.c          |    4 +-
 src/libtracker-data/tracker-sparql-expression.vala |    6 +
 src/libtracker-data/tracker-sparql-query.vala      |   68 +-
 src/libtracker-db/libtracker-db.vapi               |    5 +
 src/libtracker-db/tracker-db-interface-sqlite.c    |   35 +-
 src/libtracker-db/tracker-db-interface-sqlite.h    |    2 +
 src/libtracker-db/tracker-db-interface.c           |    5 +-
 src/libtracker-db/tracker-db-interface.h           |   26 +-
 src/libtracker-db/tracker-db-manager.c             |    2 +-
 src/libtracker-extract/tracker-exif.c              |   11 +-
 src/libtracker-extract/tracker-utils.c             |  108 ++
 src/libtracker-extract/tracker-utils.h             |    7 +-
 src/libtracker-miner/tracker-miner-fs.c            |    4 +-
 src/miners/Makefile.am                             |    4 +
 src/miners/flickr/Makefile.am                      |   67 ++
 src/miners/flickr/tracker-miner-flickr.vala        |  884 ++++++++++++++
 src/miners/fs/tracker-miner-files.c                |   33 +-
 src/plugins/evolution/tracker-evolution-plugin.c   |   19 +-
 src/tracker-extract/Makefile.am                    |   14 +-
 src/tracker-extract/tracker-extract-abw.c          |    3 +-
 src/tracker-extract/tracker-extract-msoffice.c     |  122 +--
 src/tracker-extract/tracker-extract-oasis.c        |   85 +-
 src/tracker-extract/tracker-extract-ps.c           |   82 +--
 src/tracker-extract/tracker-gsf.c                  |  153 +++
 src/tracker-extract/tracker-gsf.h                  |   35 +
 src/tracker-search-tool/tracker-search-tool.gs     |    8 +-
 src/tracker-store/tracker-resources.c              |  134 ++-
 src/tracker-store/tracker-store.c                  |   65 +-
 src/tracker-store/tracker-store.h                  |    7 +-
 src/tracker-writeback/tracker-writeback-taglib.c   |    1 -
 tests/Makefile.am                                  |    1 +
 tests/functional-tests/configuration.py            |    2 +
 tests/functional-tests/data/Images/Makefile.am     |    4 +-
 .../functional-tests/data/Images/test-image-2.png  |  Bin 0 -> 2374 bytes
 .../functional-tests/data/Images/test-image-3.tif  |  Bin 0 -> 4594 bytes
 tests/functional-tests/metadata_extraction_tc.py   |    9 +-
 tests/functional-tests/miner-basic-ops.py          |  964 ++++++++--------
 tests/functional-tests/performance-tc.py           | 1255 +++++++++++++++++++-
 tests/functional-tests/writeback-tc.py             |  114 ++-
 tests/libtracker-client/Makefile.am                |   30 +
 tests/libtracker-client/tracker-test.c             |   80 ++
 tests/libtracker-data/functions/Makefile.am        |    4 +-
 .../functions/functions-xpath-6.out                |    5 +
 .../libtracker-data/functions/functions-xpath-6.rq |    9 +
 tests/libtracker-data/tracker-sparql-test.c        |    1 +
 utils/data-generators/cc/default.cfg               |    3 +
 utils/data-generators/cc/gen_data.py               |   16 +-
 utils/data-generators/cc/generate                  |   69 +-
 utils/data-generators/cc/max.cfg                   |    3 +
 utils/data-generators/cc/mfo.py                    |   46 +-
 utils/data-generators/cc/mlo.py                    |   95 ++
 utils/data-generators/cc/mto.py                    |   58 +-
 utils/data-generators/cc/ncal.py                   |  117 +-
 utils/data-generators/cc/nco.py                    |  134 ++-
 utils/data-generators/cc/nfo.py                    |  111 +-
 utils/data-generators/cc/nmm.py                    |  165 ++--
 utils/data-generators/cc/nmo.py                    |  252 ++---
 utils/data-generators/cc/ontology_prefixes.py      |    1 +
 .../cc/template/mfo_FeedChannel.tmpl               |    7 -
 .../cc/template/mfo_FeedMessage.tmpl               |    7 -
 .../cc/template/mto_TransferElement.tmpl           |    6 -
 .../cc/template/mto_UploadTransfer.tmpl            |    6 -
 utils/data-generators/cc/template/ncal_Alarm.tmpl  |    7 -
 .../data-generators/cc/template/ncal_Calendar.tmpl |    1 -
 utils/data-generators/cc/template/ncal_Event.tmpl  |   20 -
 utils/data-generators/cc/template/ncal_Todo.tmpl   |   14 -
 .../cc/template/nco_EmailAddress.tmpl              |    2 -
 .../cc/template/nco_PersonContact.tmpl             |    8 -
 .../cc/template/nco_PhoneNumber.tmpl               |    2 -
 .../cc/template/nco_PostalAddress.tmpl             |    6 -
 .../cc/template/nfo_PlainTextDocument.tmpl         |   12 -
 .../cc/template/nfo_SoftwareApplication.tmpl       |   10 -
 .../cc/template/nfo_SoftwareCategory.tmpl          |    3 -
 .../cc/template/nfo_WebHistory.tmpl                |    7 -
 utils/data-generators/cc/template/nmm_Artist.tmpl  |    2 -
 .../cc/template/nmm_MusicAlbum.tmpl                |    3 -
 .../cc/template/nmm_MusicPiece.tmpl                |   22 -
 utils/data-generators/cc/template/nmm_Photo.tmpl   |   18 -
 utils/data-generators/cc/template/nmm_Video.tmpl   |   14 -
 utils/data-generators/cc/template/nmo_Call.tmpl    |   11 -
 .../cc/template/nmo_CommunicationChannel.tmpl      |    6 -
 utils/data-generators/cc/template/nmo_Email.tmpl   |   14 -
 .../data-generators/cc/template/nmo_IMMessage.tmpl |   14 -
 .../cc/template/nmo_MailAccount.tmpl               |    4 -
 .../cc/template/nmo_MailFolder.tmpl                |    3 -
 .../cc/template/nmo_SMSMessage.tmpl                |   15 -
 .../cc/template/tracker_Volume.tmpl                |    1 -
 utils/data-generators/cc/tools.py                  |   35 +-
 utils/data-generators/cc/tracker.py                |   15 +-
 121 files changed, 5019 insertions(+), 1995 deletions(-)
---