[tracker: 6/6] Merge branch 'guarantee'

[Martyn James Russell <mr src gnome org>]

commit 1efc97aa3692aa74fcc0e8dbbf58a6b247bb3425
Merge: 7503817 a7d1ea5
Author: Martyn Russell <martyn lanedo com>
Date:   Wed Dec 15 09:33:20 2010 +0000

    Merge branch 'guarantee'

 configure.ac                                     |   21 +++-
 src/libtracker-extract/Makefile.am               |    3 +
 src/libtracker-extract/tracker-extract.h         |    1 +
 src/libtracker-extract/tracker-guarantee.c       |  168 ++++++++++++++++++++++
 src/libtracker-extract/tracker-guarantee.h       |   44 ++++++
 src/tracker-extract/tracker-extract-flac.c       |    4 +-
 src/tracker-extract/tracker-extract-gif.c        |   16 +-
 src/tracker-extract/tracker-extract-gstreamer.c  |   42 ++++--
 src/tracker-extract/tracker-extract-gupnp-dlna.c |   47 ++++--
 src/tracker-extract/tracker-extract-jpeg.c       |   16 +-
 src/tracker-extract/tracker-extract-mp3.c        |   17 +--
 src/tracker-extract/tracker-extract-png.c        |   17 ++-
 src/tracker-extract/tracker-extract-tiff.c       |   18 ++--
 13 files changed, 340 insertions(+), 74 deletions(-)
---