[tracker: 2/2] Merge branch 'tracker-preferences'

[Philip Van Hoof <pvanhoof src gnome org>]

commit a0b131c4c796d4291c46aac742034e28e36ed2cf
Merge: 2a9c51e... 3a2601d...
Author: Philip Van Hoof <philip codeminded be>
Date:   Tue Sep 15 13:06:31 2009 +0200

    Merge branch 'tracker-preferences'

 src/tracker-miner-fs/tracker-config.c              |    7 +
 src/tracker-miner-fs/tracker-config.h              |    2 +
 src/tracker-preferences/Makefile.am                |   33 +-
 src/tracker-preferences/config.vapi                |    2 +
 src/tracker-preferences/tracker-config.vapi        |   50 +
 .../tracker-preferences-dialogs.c                  |   85 -
 .../tracker-preferences-dialogs.h                  |   31 -
 src/tracker-preferences/tracker-preferences-main.c |   46 -
 .../tracker-preferences-utils.c                    |  137 --
 .../tracker-preferences-utils.h                    |   48 -
 src/tracker-preferences/tracker-preferences.c      | 1201 -----------
 src/tracker-preferences/tracker-preferences.h      |   50 -
 src/tracker-preferences/tracker-preferences.ui     | 2165 ++++++--------------
 src/tracker-preferences/tracker-preferences.vala   |  316 +++
 14 files changed, 977 insertions(+), 3196 deletions(-)
---