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



commit 86277169eccf94cf67269804ecf3652eaf916e6d
Merge: 2001af5 f5c7d1a
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Jul 1 18:02:24 2010 +0100

    Merge branch 'master' into harmattan

 AUTHORS                                            |    2 +
 NEWS                                               |   47 ++
 configure.ac                                       |    6 +-
 data/dbus/tracker-miner.xml                        |    4 -
 po/de.po                                           |  258 ++++---
 po/es.po                                           |  263 ++++---
 po/et.po                                           |  200 ++----
 po/sl.po                                           |  259 ++++---
 src/libtracker-client/tracker-client.vapi          |   14 +
 src/libtracker-client/tracker.c                    |   73 ++-
 src/libtracker-data/tracker-data-update.c          |    4 +-
 src/libtracker-miner/tracker-miner-fs.c            |   40 +-
 src/libtracker-miner/tracker-miner-object.c        |   23 +-
 src/libtracker-miner/tracker-miner-object.h        |    3 -
 src/libtracker-miner/tracker-storage.c             |   48 +-
 src/miners/fs/tracker-miner-applications.c         |  145 +++-
 src/miners/fs/tracker-miner-files.c                |    4 +-
 src/plugins/evolution/tracker-evolution-plugin.c   |   37 +-
 src/tracker-control/tracker-control.c              |    2 +-
 src/tracker-extract/tracker-extract-gstreamer.c    |   32 +-
 src/tracker-extract/tracker-extract-jpeg.c         |    1 +
 src/tracker-extract/tracker-extract-msoffice.c     |    3 +-
 src/tracker-extract/tracker-extract-pdf.cpp        |    8 +
 src/tracker-extract/tracker-extract-xmp.c          |    1 +
 src/tracker-preferences/tracker-preferences.vala   |   18 +-
 src/tracker-search-bar/tracker-search-bar.ui       |    4 +-
 src/tracker-search-tool/tracker-metadata-tile.gs   |   90 ++--
 src/tracker-status-icon/tracker-status-icon.c      |    4 +-
 src/tracker-store/tracker-events.c                 |    2 +-
 src/tracker-store/tracker-resource-class.c         |  181 ++----
 src/tracker-store/tracker-resources.c              |    3 +
 src/tracker-store/tracker-steroids.c               |    2 +-
 src/tracker-store/tracker-store.c                  |   45 +-
 tests/functional-tests/Makefile.am                 |    1 +
 tests/functional-tests/configuration.py.orig       |   75 --
 .../functional-tests/data/Images/test-image-1.jpg  |  Bin 7752 -> 7558 bytes
 tests/functional-tests/mass-storage-mode.py        |  778 ++++++++++++++++++++
 tests/functional-tests/miner-basic-ops.py          |   51 +--
 tests/functional-tests/tests.xml                   |   90 +++
 tests/tracker-steroids/tracker-test.c              |   19 +-
 40 files changed, 1858 insertions(+), 982 deletions(-)
---



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]