[tracker: 2/2] Merge branch 'new-userguides-miner'

[Martyn James Russell <mr src gnome org>]

commit f8409b53702ca47085dcf86dc57fb810d22cc61e
Merge: 815db76 1ff6f9b
Author: Martyn Russell <martyn lanedo com>
Date:   Tue Apr 29 20:54:16 2014 +0100

    Merge branch 'new-userguides-miner'

 configure.ac                                       |   52 +++-
 data/Makefile.am                                   |   10 +
 data/dbus/Makefile.am                              |    9 +-
 ...reedesktop.Tracker1.Miner.Userguides.service.in |    2 +-
 data/miners/Makefile.am                            |    9 +-
 data/tracker-miner-user-guides.desktop.in.in       |   19 ++
 src/libtracker-miner/tracker-file-notifier.c       |    2 +
 src/miners/fs/Makefile.am                          |    9 -
 src/miners/fs/tracker-config.c                     |    6 -
 src/miners/fs/tracker-main.c                       |  203 +---------------
 src/miners/user-guides/Makefile.am                 |   22 ++
 src/miners/user-guides/tracker-main.c              |  266 ++++++++++++++++++++
 .../tracker-miner-user-guides.c}                   |   14 +-
 .../tracker-miner-user-guides.h}                   |    0
 14 files changed, 374 insertions(+), 249 deletions(-)
---