[tracker: 17/19] Merge branch 'media-art-enhancements'

[Martyn James Russell <mr src gnome org>]

commit c08724694e28d6500db6a0c87a5d7100e36aeb9a
Merge: 9b8010c 768ac52
Author: Martyn Russell <martyn lanedo com>
Date:   Wed Dec 14 16:35:45 2011 +0000

    Merge branch 'media-art-enhancements'

 configure.ac                                       |    8 +-
 src/libtracker-common/Makefile.am                  |    4 +-
 .../{tracker-albumart.c => tracker-media-art.c}    |  119 ++--
 .../{tracker-albumart.h => tracker-media-art.h}    |   20 +-
 src/libtracker-extract/tracker-guarantee.c         |   28 +-
 src/libtracker-extract/tracker-guarantee.h         |    9 +-
 src/libtracker-miner/Makefile.am                   |    6 +-
 .../{tracker-albumart.c => tracker-media-art.c}    |   40 +-
 .../{tracker-albumart.h => tracker-media-art.h}    |   13 +-
 src/libtracker-miner/tracker-miner-fs.c            |    7 +-
 src/libtracker-miner/tracker-miner.h               |    2 +-
 src/tracker-extract/Makefile.am                    |   12 +-
 src/tracker-extract/tracker-extract-flac.c         |    2 +-
 src/tracker-extract/tracker-extract-gif.c          |    3 +-
 src/tracker-extract/tracker-extract-gstreamer.c    |  103 ++--
 src/tracker-extract/tracker-extract-jpeg.c         |    3 +-
 src/tracker-extract/tracker-extract-mp3.c          |   60 +-
 src/tracker-extract/tracker-extract-png.c          |    3 +-
 src/tracker-extract/tracker-extract-tiff.c         |    3 +-
 src/tracker-extract/tracker-main.c                 |   12 +-
 ...-albumart-dummy.c => tracker-media-art-dummy.c} |   18 +-
 ...umart-generic.h => tracker-media-art-generic.h} |   22 +-
 ...lbumart-pixbuf.c => tracker-media-art-pixbuf.c} |   18 +-
 ...er-albumart-qt.cpp => tracker-media-art-qt.cpp} |   18 +-
 .../{tracker-albumart.c => tracker-media-art.c}    |  785 +++++++++++---------
 .../{tracker-albumart.h => tracker-media-art.h}    |   31 +-
 tests/libtracker-extract/tracker-guarantee-test.c  |    8 +-
 27 files changed, 767 insertions(+), 590 deletions(-)
---