[tracker: 12/12] Merge branch 'extractor-rules-list'

[Martyn James Russell <mr src gnome org>]

commit b2b9096a1777e8e343c3493d7e330ff542fd39c2
Merge: f951b13 2cc18d4
Author: Martyn Russell <martyn lanedo com>
Date:   Tue Mar 15 16:22:55 2011 +0000

    Merge branch 'extractor-rules-list'

 docs/manpages/tracker-extract.1                    |   10 +-
 examples/libtracker-extract/01-mockup.rule.in      |    4 +
 examples/libtracker-extract/Makefile.am            |   11 +
 .../libtracker-extract/tracker-extract-mockup.c    |   41 +--
 src/libtracker-extract/Makefile.am                 |    4 +
 src/libtracker-extract/tracker-data.h              |  103 ++----
 src/libtracker-extract/tracker-extract.h           |    1 +
 src/libtracker-extract/tracker-module-manager.c    |  292 +++++++++++++++++
 src/libtracker-extract/tracker-module-manager.h    |   47 +++
 src/miners/fs/Makefile.am                          |    1 +
 src/miners/fs/tracker-miner-files.c                |   10 +-
 src/tracker-extract/10-abw.rule.in                 |    4 +
 src/tracker-extract/10-flac.rule.in                |    4 +
 src/tracker-extract/10-gif.rule.in                 |    4 +
 src/tracker-extract/10-html.rule.in                |    4 +
 src/tracker-extract/10-ico.rule.in                 |    4 +
 src/tracker-extract/10-jpeg.rule.in                |    4 +
 src/tracker-extract/10-mp3.rule.in                 |    4 +
 src/tracker-extract/10-msoffice.rule.in            |    4 +
 src/tracker-extract/10-oasis.rule.in               |    4 +
 src/tracker-extract/10-pdf.rule.in                 |    3 +
 src/tracker-extract/10-png.rule.in                 |    4 +
 src/tracker-extract/10-ps.rule.in                  |    4 +
 src/tracker-extract/10-svg.rule.in                 |    4 +
 src/tracker-extract/10-tiff.rule.in                |    4 +
 src/tracker-extract/10-vorbis.rule.in              |    4 +
 src/tracker-extract/10-xmp.rule.in                 |    4 +
 src/tracker-extract/11-msoffice-xml.rule.in        |    4 +
 src/tracker-extract/15-gstreamer-guess.rule.in     |    4 +
 src/tracker-extract/15-playlist.rule.in            |    4 +
 src/tracker-extract/15-real-media.rule.in          |    4 +
 src/tracker-extract/16-upnp-guess.rule.in          |    4 +
 src/tracker-extract/90-gstreamer-generic.rule.in   |    4 +
 src/tracker-extract/90-text-generic.rule.in        |    3 +
 src/tracker-extract/91-upnp-generic.rule.in        |    4 +
 src/tracker-extract/92-xine-generic.rule.in        |    4 +
 src/tracker-extract/93-mplayer-generic.rule.in     |    4 +
 src/tracker-extract/93-totem-generic.rule.in       |    4 +
 src/tracker-extract/Makefile.am                    |   67 ++++-
 src/tracker-extract/tracker-extract-abw.c          |   25 +-
 src/tracker-extract/tracker-extract-flac.c         |   28 +--
 src/tracker-extract/tracker-extract-gif.c          |   29 +--
 .../tracker-extract-gstreamer-helix.c              |   49 +--
 src/tracker-extract/tracker-extract-gstreamer.c    |   93 ++----
 src/tracker-extract/tracker-extract-gupnp-dlna.c   |   79 ++----
 src/tracker-extract/tracker-extract-html.c         |   25 +-
 src/tracker-extract/tracker-extract-icon.c         |   24 +-
 src/tracker-extract/tracker-extract-jpeg.c         |   30 +--
 src/tracker-extract/tracker-extract-libxine.c      |   29 +-
 src/tracker-extract/tracker-extract-mp3.c          |   35 +--
 src/tracker-extract/tracker-extract-mplayer.c      |   26 +-
 src/tracker-extract/tracker-extract-msoffice-xml.c |   28 +--
 src/tracker-extract/tracker-extract-msoffice.c     |   57 +---
 src/tracker-extract/tracker-extract-oasis.c        |   54 +---
 src/tracker-extract/tracker-extract-pdf.c          |   39 +--
 src/tracker-extract/tracker-extract-playlist.c     |   31 +--
 src/tracker-extract/tracker-extract-png.c          |   39 +--
 src/tracker-extract/tracker-extract-ps.c           |   35 +--
 src/tracker-extract/tracker-extract-text.c         |   25 +-
 src/tracker-extract/tracker-extract-tiff.c         |   26 +-
 src/tracker-extract/tracker-extract-totem.c        |   28 +-
 src/tracker-extract/tracker-extract-vorbis.c       |   29 +--
 src/tracker-extract/tracker-extract-xmp.c          |   28 +-
 src/tracker-extract/tracker-extract.c              |  345 +++-----------------
 64 files changed, 876 insertions(+), 1057 deletions(-)
---