[tracker: 5/5] Merge branch 'miner-fs-remaining-time'

[Martyn James Russell <mr src gnome org>]

commit 15866543cf6598b33c916c6ab7eeb49d3f445a21
Merge: a380b0c a5716fa
Author: Martyn Russell <martyn lanedo com>
Date:   Wed Mar 30 17:50:29 2011 +0100

    Merge branch 'miner-fs-remaining-time'

 data/dbus/tracker-miner.xml                   |    4 +
 src/libtracker-common/tracker-utils.c         |   46 +++++----
 src/libtracker-common/tracker-utils.h         |    5 +-
 src/libtracker-miner/tracker-marshal.list     |    4 +-
 src/libtracker-miner/tracker-miner-fs.c       |   21 ++++-
 src/libtracker-miner/tracker-miner-manager.c  |  132 +++++++++++++++---------
 src/libtracker-miner/tracker-miner-manager.h  |    3 +-
 src/libtracker-miner/tracker-miner-object.c   |   77 ++++++++++++--
 src/tracker-control/tracker-control-general.c |    7 +-
 src/tracker-control/tracker-control-miners.c  |   37 +------
 src/tracker-control/tracker-control-status.c  |   82 +++++++++++-----
 11 files changed, 274 insertions(+), 144 deletions(-)
---