[tracker/harmattan-pre-signal-updates: 715/1380] Merge branch 'master' into harmattan

[Martyn James Russell <mr src gnome org>]

commit d624a2d2e630d3d326613c30c292135305c49b6f
Merge: 9938ceb 29b2446
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Jul 8 15:38:59 2010 +0100

    Merge branch 'master' into harmattan

 NEWS                                              |   43 +
 configure.ac                                      |   33 +-
 po/de.po                                          |   26 +-
 po/sl.po                                          |   26 +-
 src/Makefile.am                                   |    5 -
 src/libinotify/.cvsignore                         |    5 -
 src/libinotify/Makefile.am                        |   24 -
 src/libinotify/inotify-handle.c                   |  274 ----
 src/libinotify/inotify-handle.h                   |   57 -
 src/libinotify/inotify-listhash.c                 |  133 --
 src/libinotify/inotify-listhash.h                 |   35 -
 src/libinotify/inotify-log.h                      |   52 -
 src/libinotify/inotify-monitor.c                  |  412 ------
 src/libinotify/inotify-monitor.h                  |   34 -
 src/libinotify/libinotify.h                       |   27 -
 src/libtracker-client/Makefile.am                 |    1 +
 src/libtracker-client/tracker-client.vapi         |    6 +-
 src/libtracker-client/tracker.c                   |  206 +---
 src/libtracker-common/tracker-dbus.c              |  257 ++++-
 src/libtracker-common/tracker-dbus.h              |   48 +-
 src/libtracker-db/Makefile.am                     |    1 -
 src/libtracker-db/tracker-db-dbus.c               |   18 +-
 src/libtracker-db/tracker-db-interface-sqlite.c   |    4 +-
 src/libtracker-db/tracker-db-journal.c            |   56 +-
 src/libtracker-fts/tracker-fts.c                  |    7 +-
 src/libtracker-miner/Makefile-shared-sources.decl |   13 +
 src/libtracker-miner/Makefile.am                  |   26 +-
 src/libtracker-miner/tracker-miner-object.c       |    4 -
 src/libtracker-miner/tracker-monitor.c            | 1328 +++++---------------
 src/libtracker-miner/tracker-monitor.h            |    7 -
 src/libtracker-miner/tracker-storage.c            |  108 +-
 src/miners/flickr/Makefile.am                     |    1 -
 src/miners/fs/Makefile.am                         |    2 +-
 src/miners/fs/tracker-miner-files.c               |  155 +++-
 src/miners/rss/Makefile.am                        |    1 -
 src/tracker-extract/Makefile.am                   |    1 +
 src/tracker-extract/tracker-dbus.c                |   21 +
 src/tracker-extract/tracker-dbus.h                |    5 +
 src/tracker-extract/tracker-extract-mp3.c         |    5 +-
 src/tracker-extract/tracker-extract-pdf.cpp       |   14 +-
 src/tracker-extract/tracker-extract.c             |  242 ++++-
 src/tracker-extract/tracker-extract.h             |    6 +
 src/tracker-extract/tracker-main.c                |    5 +
 src/tracker-store/tracker-main.c                  |    5 +-
 src/tracker-store/tracker-resource-class.c        |    7 +-
 src/tracker-store/tracker-resources.c             |    6 +-
 src/tracker-store/tracker-store.c                 |    3 +-
 src/tracker-writeback/tracker-writeback-file.c    |    4 +-
 tests/libtracker-common/mock-dbus.c               |   82 +-
 tests/libtracker-fts/tracker-parser-test.c        |   26 +-
 tests/libtracker-miner/Makefile.am                |   14 +-
 tests/libtracker-miner/miners-mock.c              |  367 +++---
 tests/libtracker-miner/thumbnailer-mock.c         |  113 +-
 tests/libtracker-miner/tracker-monitor-test.c     | 1406 +++++++++++++++++++++
 tests/tracker-miner-fs/Makefile.am                |    7 -
 tests/tracker-steroids/tracker-test.c             |    1 -
 tests/tracker-store/Makefile.am                   |    1 -
 57 files changed, 2982 insertions(+), 2794 deletions(-)
---