[tracker: 37/37] Merge branch 'anonymous-file-nodes'

[Martyn James Russell <mr src gnome org>]

commit ef33cfa71c19d415ab5cbfa31c3ea13d0ef62f83
Merge: 28e3a3a 60658be
Author: Martyn Russell <martyn lanedo com>
Date:   Wed Feb 3 15:44:47 2010 +0000

    Merge branch 'anonymous-file-nodes'

 data/dbus/tracker-extract.xml                      |    3 +-
 src/libtracker-common/tracker-sparql-builder.vala  |   73 ++++++++++-
 src/libtracker-common/tracker-storage-hal.c        |   12 ++
 src/libtracker-data/tracker-data-update.c          |   24 +++-
 src/libtracker-data/tracker-data-update.h          |    2 +-
 src/libtracker-data/tracker-sparql-query.vala      |    4 +-
 src/libtracker-extract/tracker-extract.h           |   39 ++++--
 src/libtracker-miner/tracker-miner-fs.c            |  140 +++++++++++---------
 src/tracker-extract/tracker-extract-abw.c          |    3 +-
 .../tracker-extract-gstreamer-helix.c              |   17 ++-
 src/tracker-extract/tracker-extract-gstreamer.c    |  132 +++++++++++++++----
 src/tracker-extract/tracker-extract-html.c         |    3 +-
 src/tracker-extract/tracker-extract-imagemagick.c  |   11 +-
 src/tracker-extract/tracker-extract-jpeg.c         |   18 ++-
 src/tracker-extract/tracker-extract-libxine.c      |   29 +++--
 src/tracker-extract/tracker-extract-mp3.c          |   54 ++++++--
 src/tracker-extract/tracker-extract-mplayer.c      |   29 +++--
 src/tracker-extract/tracker-extract-msoffice.c     |    5 +-
 src/tracker-extract/tracker-extract-oasis.c        |    7 +-
 src/tracker-extract/tracker-extract-pdf.c          |    3 +-
 src/tracker-extract/tracker-extract-playlist.c     |    7 +-
 src/tracker-extract/tracker-extract-png.c          |    7 +-
 src/tracker-extract/tracker-extract-ps.c           |    7 +-
 src/tracker-extract/tracker-extract-text.c         |    3 +-
 src/tracker-extract/tracker-extract-tiff.c         |   22 ++--
 src/tracker-extract/tracker-extract-totem.c        |   35 +++--
 src/tracker-extract/tracker-extract-vorbis.c       |   50 ++++++--
 src/tracker-extract/tracker-extract-xmp.c          |    2 +
 src/tracker-extract/tracker-extract.c              |   99 ++++++++++-----
 src/tracker-miner-fs/tracker-main.c                |    2 +-
 src/tracker-miner-fs/tracker-miner-files.c         |  119 ++++++++++++++---
 src/tracker-search-bar/tracker-results-window.c    |   15 ++-
 src/tracker-utils/tracker-info.c                   |   32 ++++-
 src/tracker-utils/tracker-search.c                 |   92 ++++++++++----
 src/tracker-utils/tracker-tag.c                    |   18 +--
 src/tracker-writeback/tracker-writeback-consumer.c |   13 +-
 src/tracker-writeback/tracker-writeback-mp3.c      |    4 +-
 src/tracker-writeback/tracker-writeback-playlist.c |    2 +-
 src/tracker-writeback/tracker-writeback-xmp.c      |  120 ++++++++---------
 39 files changed, 868 insertions(+), 389 deletions(-)
---