[tracker: 14/14] Merge branch 'miner-fs-initable-iface'

[Martyn James Russell <mr src gnome org>]

commit f81e841b02852fd250af95aca03c913d2cb2915b
Merge: 6a3ac91 1ef394c
Author: Martyn Russell <martyn lanedo com>
Date:   Wed Feb 2 17:25:07 2011 +0000

    Merge branch 'miner-fs-initable-iface'

 .../libtracker-miner/libtracker-miner-sections.txt |    3 +
 .../tracker-miner-fs-processing-pool.c             |   43 +--
 .../tracker-miner-fs-processing-pool.h             |    7 +-
 src/libtracker-miner/tracker-miner-fs.c            |    8 +-
 src/libtracker-miner/tracker-miner-object.c        |  356 +++++++++++++-------
 src/libtracker-miner/tracker-miner-object.h        |   23 +-
 src/libtracker-miner/tracker-miner-web.c           |  222 ++++++-------
 src/libtracker-miner/tracker-miner-web.h           |    1 +
 src/libtracker-miner/tracker-miner.vapi            |    7 +-
 src/miners/flickr/tracker-miner-flickr.vala        |   38 ++-
 src/miners/fs/tracker-main.c                       |   41 ++-
 src/miners/fs/tracker-miner-applications.c         |   66 +++--
 src/miners/fs/tracker-miner-applications.h         |    2 +-
 src/miners/fs/tracker-miner-files.c                |  272 +++++++++-------
 src/miners/fs/tracker-miner-files.h                |   31 +-
 src/miners/rss/tracker-main.c                      |    9 +-
 src/miners/rss/tracker-miner-rss.c                 |   14 +-
 src/miners/rss/tracker-miner-rss.h                 |    3 +-
 18 files changed, 662 insertions(+), 484 deletions(-)
---