[folks/next: 50/57] Merge branch 'master' into next

[Simon McVittie <smcv src gnome org>]

commit df15a2e6ece1afa76425fd1186710afd567ff321
Merge: f27bd6c 766510d
Author: Simon McVittie <simon mcvittie collabora co uk>
Date:   Tue Mar 25 09:45:30 2014 +0000

    Merge branch 'master' into next

 HACKING                                     |    5 +-
 NEWS                                        |    4 +
 autogen.sh                                  |   13 -
 backends/bluez/Makefile.am                  |    1 +
 backends/bluez/bluez-backend-factory.vala   |   31 +-
 backends/bluez/bluez-backend.vala           |   29 +-
 backends/bluez/bluez-persona-store.vala     |  110 +++-
 backends/bluez/bluez-persona.vala           |  305 ++++++----
 backends/dummy/lib/dummy-full-persona.vala  |   15 +-
 backends/dummy/lib/dummy-persona.vala       |   30 +-
 backends/eds/eds-backend.vala               |   14 +-
 backends/eds/lib/edsf-persona-store.vala    |   35 +-
 backends/eds/lib/edsf-persona.vala          |    3 +-
 backends/tracker/lib/trf-persona-store.vala |    9 +-
 check.mk                                    |    1 -
 configure.ac                                |   25 +-
 docs/Makefile.am                            |    1 +
 folks/anti-linkable.vala                    |   70 ++-
 folks/backend-store.vala                    |   12 +
 folks/individual-aggregator.vala            |   19 +-
 m4/vala.m4                                  |   70 --
 po/da.po                                    |  367 +++++++----
 po/fr.po                                    |  475 +++++++++-----
 po/it.po                                    |  360 +++++++----
 po/ko.po                                    |  370 +++++++----
 po/lv.po                                    |  353 +++++++----
 po/nb.po                                    |  340 +++++++----
 po/pt.po                                    |  358 +++++++----
 po/ru.po                                    |  342 +++++++---
 tests/Makefile.am                           |    7 +
 tests/bluez/Makefile.am                     |   48 ++
 tests/bluez/device-properties.vala          |  305 +++++++++
 tests/bluez/individual-retrieval.vala       |  232 +++++++
 tests/bluez/vcard-parsing.vala              |  255 ++++++++
 tests/dummy/Makefile.am                     |    5 +
 tests/dummy/linkable-properties.vala        |  275 ++++++++
 tests/eds/Makefile.am                       |   12 -
 tests/eds/helper-create-many-contacts.vala  |    2 +-
 tests/eds/helper-delete-contacts.vala       |    2 +-
 tests/eds/helper-prepare-aggregator.vala    |    2 +-
 tests/folks/Makefile.am                     |    4 -
 tests/lib/Makefile.am                       |   12 +
 tests/lib/bluez/Makefile.am                 |   51 ++
 tests/lib/bluez/backend.vala                |  306 +++++++++
 tests/lib/bluez/test-case.vala              |  127 ++++
 tests/lib/dummy/Makefile.am                 |    1 +
 tests/lib/eds/Makefile.am                   |    1 +
 tests/lib/eds/test-case.vala                |   96 +++-
 tests/lib/folks-test-dbus.vapi              |   52 ++
 tests/lib/gtestdbus.c                       |  941 +++++++++++++++++++++++++++
 tests/lib/gtestdbus.h                       |   90 +++
 tests/lib/key-file/Makefile.am              |    1 +
 tests/lib/libsocialweb/Makefile.am          |    1 +
 tests/lib/org-freedesktop-dbus-mock.vala    |  124 ++++
 tests/lib/telepathy/Makefile.am             |    9 +
 tests/lib/telepathy/test-case.vala          |    5 +
 tests/lib/test-case.vala                    |  158 +++++-
 tests/lib/test-utils.vala                   |   92 +++
 tests/lib/tracker/Makefile.am               |    1 +
 tests/lib/tracker/test-case.vala            |   66 ++-
 tests/libsocialweb/Makefile.am              |    4 -
 tests/telepathy/Makefile.am                 |    5 -
 tests/test.mk                               |    1 +
 tests/tools/Makefile.am                     |    7 -
 tests/tools/dbus-session.sh                 |  119 ----
 tests/tools/eds.sh                          |   35 -
 tests/tools/execute-test.sh                 |   30 -
 tests/tools/tracker.sh                      |   34 -
 tests/tools/with-session-bus-eds.sh         |   49 --
 tests/tools/with-session-bus-tracker.sh     |   48 --
 tests/tools/with-session-bus.sh             |   42 --
 tests/tracker/Makefile.am                   |   11 -
 72 files changed, 5729 insertions(+), 1706 deletions(-)
---