[tracker: 14/16] Fixes GB#609606, Merge branch 'swap-gio-for-hal'

[Martyn James Russell <mr src gnome org>]

commit 928da615a97cc727de66c2e97f5e2b91dfd2b86f
Merge: 6121aa8 05b826a
Author: Martyn Russell <martyn lanedo com>
Date:   Wed Feb 24 17:19:32 2010 +0000

    Fixes GB#609606, Merge branch 'swap-gio-for-hal'

 .../libtracker-common/libtracker-common-docs.sgml  |    2 -
 .../libtracker-common-sections.txt                 |   23 -
 .../libtracker-miner/libtracker-miner-docs.sgml    |    6 +
 .../libtracker-miner/libtracker-miner-sections.txt |   20 +
 src/libtracker-common/Makefile.am                  |   10 -
 src/libtracker-common/tracker-storage-hal.c        | 1165 --------------------
 src/libtracker-miner/Makefile.am                   |    5 +-
 src/libtracker-miner/tracker-marshal.list          |    1 +
 src/libtracker-miner/tracker-storage.c             |  748 +++++++++++++
 .../tracker-storage.h                              |   37 +-
 src/tracker-extract/Makefile.am                    |    1 +
 src/tracker-extract/tracker-albumart.c             |   40 +-
 src/tracker-miner-fs/tracker-miner-files.c         |   94 +-
 13 files changed, 842 insertions(+), 1310 deletions(-)
---