[tracker: 12/12] Merge branch 'libtracker-common-cleanup'

[Martyn James Russell <mr src gnome org>]

commit 87794caa62567c8ab3a049832888bd65dce2ebf1
Merge: 6ccf471 b78ae1d
Author: Martyn Russell <martyn lanedo com>
Date:   Mon Oct 27 17:33:42 2014 +0000

    Merge branch 'libtracker-common-cleanup'

 configure.ac                                       |   36 +-
 docs/manpages/Makefile.am                          |    3 +-
 docs/manpages/gsettings.xsl                        |   54 ++
 docs/tools/ontology-graph.c                        |   33 +-
 po/POTFILES.in                                     |    1 +
 src/libtracker-common/Makefile.am                  |   34 +-
 src/libtracker-common/tracker-common.h             |   10 -
 src/libtracker-common/tracker-config-file.c        |  730 --------------------
 src/libtracker-common/tracker-config-file.h        |   84 ---
 src/libtracker-common/tracker-file-utils.c         |  223 +------
 src/libtracker-common/tracker-file-utils.h         |    2 -
 src/libtracker-common/tracker-keyfile-object.c     |  436 ------------
 src/libtracker-common/tracker-keyfile-object.h     |   99 ---
 src/libtracker-common/tracker-locale-gconfdbus.c   |  563 ---------------
 src/libtracker-common/tracker-locale-gconfdbus.h   |   44 --
 src/libtracker-common/tracker-locale.c             |   53 +--
 src/libtracker-common/tracker-locale.h             |   18 +-
 src/libtracker-common/tracker-meego.cpp            |   94 ---
 src/libtracker-common/tracker-meego.h              |   37 -
 src/libtracker-common/tracker-miner-locale.c       |  153 ----
 src/libtracker-common/tracker-miner-locale.h       |   30 -
 src/libtracker-common/tracker-ontologies.h         |   62 --
 src/libtracker-common/tracker-os-dependant-unix.c  |  360 ----------
 src/libtracker-common/tracker-os-dependant-win.c   |  182 -----
 src/libtracker-common/tracker-os-dependant.h       |   59 --
 src/libtracker-common/tracker-type-utils.c         |  127 ----
 src/libtracker-common/tracker-type-utils.h         |   12 -
 src/libtracker-data/.gitignore                     |    1 +
 src/libtracker-data/Makefile.am                    |   24 +-
 .../tracker-crc32.c                                |    2 +-
 .../tracker-crc32.h                                |    0
 src/libtracker-data/tracker-data-backup.c          |  110 ++-
 src/libtracker-data/tracker-data-manager.c         |  122 ++--
 src/libtracker-data/tracker-data-manager.h         |    4 +-
 src/libtracker-data/tracker-data-update.c          |   37 +-
 src/libtracker-data/tracker-data-update.h          |    2 +-
 src/libtracker-data/tracker-db-config.c            |   70 ++-
 src/libtracker-data/tracker-db-config.h            |    2 -
 src/libtracker-data/tracker-db-interface-sqlite.c  |   20 -
 src/libtracker-data/tracker-db-journal.c           |   14 +-
 src/libtracker-data/tracker-db-manager.c           |    8 +-
 src/libtracker-data/tracker-ontologies.c           |    5 +-
 src/libtracker-data/tracker-property.c             |   14 +-
 src/libtracker-fts/.gitignore                      |    1 +
 src/libtracker-fts/Makefile.am                     |   25 +-
 src/libtracker-fts/tracker-fts-config.c            |   78 ++-
 src/libtracker-fts/tracker-fts-config.h            |    7 +-
 src/libtracker-fts/tracker-fts-tokenizer.c         |    3 +
 src/libtracker-miner/Makefile.am                   |    1 -
 src/libtracker-miner/tracker-decorator-fs.c        |   67 ++-
 src/libtracker-miner/tracker-file-notifier.c       |    4 +-
 src/libtracker-miner/tracker-miner-common.h        |   25 -
 src/libtracker-miner/tracker-miner-fs.c            |   28 +-
 src/libtracker-miner/tracker-miner-fs.h            |    1 -
 src/libtracker-sparql/Makefile.am                  |    5 +-
 src/libtracker-sparql/tracker-ontologies.h         |   63 ++
 src/libtracker-sparql/tracker-sparql.h             |    1 +
 src/miners/apps/tracker-miner-applications.c       |  168 +++--
 src/miners/fs/.gitignore                           |    1 +
 src/miners/fs/Makefile.am                          |   24 +-
 src/miners/fs/tracker-config.c                     |  189 +++---
 src/miners/fs/tracker-config.h                     |    2 -
 src/miners/fs/tracker-main.c                       |   10 +-
 src/miners/fs/tracker-miner-files.c                |   46 +-
 .../fs}/tracker-storage.c                          |    1 -
 .../fs}/tracker-storage.h                          |    0
 src/miners/fs/tracker-writeback-listener.c         |    2 +-
 src/miners/user-guides/tracker-miner-user-guides.c |  144 +++--
 src/tracker-control/tracker-control-general.c      |    2 +-
 src/tracker-extract/.gitignore                     |    1 +
 src/tracker-extract/93-mplayer-generic.rule        |    4 -
 src/tracker-extract/Makefile.am                    |   40 +-
 src/tracker-extract/tracker-config.c               |   94 ++-
 src/tracker-extract/tracker-config.h               |    2 -
 src/tracker-extract/tracker-extract-decorator.c    |   13 +-
 src/tracker-extract/tracker-extract-mp3.c          |   11 +
 src/tracker-extract/tracker-extract-mplayer.c      |  302 --------
 src/tracker-extract/tracker-extract-msoffice-xml.c |    3 -
 src/tracker-extract/tracker-extract-msoffice.c     |    6 +-
 src/tracker-extract/tracker-extract-oasis.c        |    4 +-
 src/tracker-extract/tracker-extract-ps.c           |   45 ++-
 src/tracker-extract/tracker-main.c                 |   12 +-
 src/tracker-store/.gitignore                       |    1 +
 src/tracker-store/Makefile.am                      |   32 +-
 src/tracker-store/tracker-config.c                 |   93 ++-
 src/tracker-store/tracker-locale-change.c          |  152 ----
 src/tracker-store/tracker-locale-change.h          |   32 -
 src/tracker-store/tracker-main.vala                |    5 -
 src/tracker-writeback/.gitignore                   |    1 +
 src/tracker-writeback/Makefile.am                  |   22 +-
 src/tracker-writeback/tracker-config.c             |   75 ++-
 src/tracker-writeback/tracker-writeback-xmp.c      |   48 +-
 src/tracker-writeback/tracker-writeback.c          |   19 +-
 tests/libtracker-common/.gitignore                 |    3 +-
 tests/libtracker-common/Makefile.am                |    3 -
 tests/libtracker-common/tracker-file-utils-test.c  |   43 --
 tests/libtracker-common/tracker-type-utils-test.c  |  255 -------
 tests/libtracker-data/.gitignore                   |    3 +-
 tests/libtracker-data/Makefile.am                  |    2 +
 tests/libtracker-data/tracker-backup-test.c        |    2 +-
 .../tracker-crc32-test.c                           |    6 +-
 tests/libtracker-data/tracker-db-journal.c         |    4 +-
 tests/libtracker-data/tracker-sparql-test.c        |    2 +-
 tests/libtracker-fts/tracker-fts-test.c            |    7 +-
 utils/tracker-sql/tracker-sql.c                    |    7 +-
 105 files changed, 1247 insertions(+), 4979 deletions(-)
---