commit 97a92c56e04e03467c2fd764e96db9b64ad26ca6
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:   Sun Jul 29 17:26:07 2012 +0200

    Release version 0.7.3

 NEWS                               |    8 ++++----
 backends/eds/lib/edsf-persona.vala |    6 +++---
 backends/key-file/kf-persona.vala  |    4 ++--
 configure.ac                       |   10 +++++-----
 folks/anti-linkable.vala           |   12 ++++++------
 folks/individual-aggregator.vala   |    2 +-
 folks/individual.vala              |    4 ++--
 folks/persona-store.vala           |    2 +-
 8 files changed, 24 insertions(+), 24 deletions(-)

commit d9cccbd2640368726a4bf04acd3be8c75289695a
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:   Sun Jul 29 09:50:38 2012 +0200

    build: Add a missing file to the tests Makefile

 tests/tools/Makefile.am |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 2e40d07dd7da9ea145a42fa7647b84b3d8144ea8
Author: Stas Solovey <whats_up@tut.by>
Date:   Sun Jul 29 18:09:24 2012 +0400

    Updated Russian translation

 po/LINGUAS |    1 +
 po/ru.po   |  663
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 664 insertions(+), 0 deletions(-)

commit bc9e6e806dc4cd7f44d9cf8d9da5b136f49d4477
Author: Christian Kirbach <Christian.Kirbach@googlemail.com>
Date:   Sun Jul 29 00:16:34 2012 +0200

    Updated German translation

 po/de.po |  585
 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 300 insertions(+), 285 deletions(-)

commit ac9d990f19a05695e243136fec18822d99affb4e
Author: Sweta Kothari <swkothar@redhat.com>
Date:   Fri Jul 27 15:30:54 2012 +0530

    Updated gujarati file  & Added LINGUAS file for gujarati

 po/LINGUAS |    1 +
 po/gu.po   |  654
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 655 insertions(+), 0 deletions(-)

commit 76b81c892c3ce7b32f58f2606cc79a1fc28e4997
Author: Jeremy Whiting <jpwhiting@kde.org>
Date:   Tue Jul 24 12:46:06 2012 -0600

    Revert "Change libgee dependency from 0.6 to 0.8."

    This reverts commit 5b5360bff7a61ef17173cbe35cc32712ca0fc329.

 backends/eds/Makefile.am                           |    2 +-
 backends/eds/lib/Makefile.am                       |    2 +-
 backends/eds/lib/folks-eds-uninstalled.pc.in       |    2 +-
 backends/eds/lib/folks-eds.deps                    |    2 +-
 backends/eds/lib/folks-eds.pc.in                   |    2 +-
 backends/key-file/Makefile.am                      |    2 +-
 backends/libsocialweb/Makefile.am                  |    2 +-
 backends/libsocialweb/lib/Makefile.am              |    4 ++--
 .../lib/folks-libsocialweb-uninstalled.pc.in       |    2 +-
 backends/libsocialweb/lib/folks-libsocialweb.pc.in |    2 +-
 backends/telepathy/Makefile.am                     |    2 +-
 backends/telepathy/lib/Makefile.am                 |    2 +-
 .../lib/folks-telepathy-uninstalled.pc.in          |    2 +-
 backends/telepathy/lib/folks-telepathy.pc.in       |    2 +-
 backends/tracker/Makefile.am                       |    2 +-
 backends/tracker/lib/Makefile.am                   |    4 ++--
 .../tracker/lib/folks-tracker-uninstalled.pc.in    |    2 +-
 backends/tracker/lib/folks-tracker.pc.in           |    2 +-
 configure.ac                                       |   17
 ++++++++++++++---
 docs/Makefile.am                                   |    8 ++++----
 folks/Makefile.am                                  |    4 ++--
 folks/folks-uninstalled.pc.in                      |    2 +-
 folks/folks.deps                                   |    2 +-
 folks/folks.pc.in                                  |    2 +-
 tests/eds/Makefile.am                              |    2 +-
 tests/folks/Makefile.am                            |    2 +-
 tests/key-file/Makefile.am                         |    2 +-
 tests/lib/Makefile.am                              |    2 +-
 tests/lib/eds/Makefile.am                          |    2 +-
 tests/lib/libsocialweb/Makefile.am                 |    2 +-
 tests/lib/telepathy/contactlist/Makefile.am        |    2 +-
 tests/lib/tracker/Makefile.am                      |    2 +-
 tests/libsocialweb/Makefile.am                     |    2 +-
 tests/telepathy/Makefile.am                        |    2 +-
 tests/tracker/Makefile.am                          |    2 +-
 tools/Makefile.am                                  |    2 +-
 tools/inspect/Makefile.am                          |    2 +-
 37 files changed, 56 insertions(+), 45 deletions(-)

commit 80f317be05e60d94fea4a691506760a8b35f314e
Author: Jeremy Whiting <jpwhiting@kde.org>
Date:   Tue Jul 24 12:44:25 2012 -0600

    Revert "Port folks to libgee 0.8."

    This reverts commit e069bbe59dc54eb3595d8ee5c96aea4a36cff9aa.

 backends/eds/lib/edsf-persona.vala                 |   60
 ++++++++++----------
 backends/key-file/kf-persona.vala                  |   15 ++---
 backends/libsocialweb/lib/swf-persona.vala         |   11 ++--
 .../telepathy/lib/tpf-persona-store-cache.vala     |   12 ++--
 backends/telepathy/lib/tpf-persona.vala            |   28 +++++-----
 backends/tracker/lib/trf-persona-store.vala        |    4 +-
 backends/tracker/lib/trf-persona.vala              |   52
 +++++++++---------
 folks/abstract-field-details.vala                  |   48
 ----------------
 folks/backend-store.vala                           |    9 ++-
 folks/debug.vala                                   |    2 +-
 folks/individual-aggregator.vala                   |    8 +-
 folks/individual.vala                              |   47
 ++++++++--------
 folks/potential-match.vala                         |    2 +-
 tests/eds/add-persona.vala                         |   20 +++---
 tests/eds/email-details.vala                       |    3 +-
 tests/eds/individual-retrieval.vala                |    3 +-
 tests/eds/link-personas.vala                       |   20 +++---
 tests/eds/phone-details.vala                       |    3 +-
 tests/eds/set-emails.vala                          |    4 +-
 tests/eds/set-im-addresses.vala                    |    4 +-
 tests/eds/set-phones.vala                          |    4 +-
 tests/eds/set-roles.vala                           |    4 +-
 tests/folks/aggregation.vala                       |    2 +-
 tests/folks/backend-loading.vala                   |   12 ++--
 tests/key-file/individual-retrieval.vala           |    3 +-
 tests/telepathy/individual-properties.vala         |   12 ++--
 tests/telepathy/individual-retrieval.vala          |    7 +-
 tests/tracker/add-persona.vala                     |   28 +++++-----
 tests/tracker/duplicated-emails.vala               |    8 +-
 tests/tracker/duplicated-phones.vala               |    8 +-
 tests/tracker/link-personas.vala                   |    8 +-
 tests/tracker/match-email-addresses.vala           |    8 +-
 tests/tracker/match-im-addresses.vala              |    8 +-
 tests/tracker/match-known-emails.vala              |    8 +-
 tests/tracker/match-phone-number.vala              |    8 +-
 tests/tracker/remove-persona.vala                  |    4 +-
 tests/tracker/set-duplicate-email.vala             |    8 +-
 tests/tracker/set-emails.vala                      |    4 +-
 tests/tracker/set-im-addresses.vala                |    4 +-
 tests/tracker/set-notes.vala                       |    4 +-
 tests/tracker/set-phones.vala                      |    4 +-
 tests/tracker/set-postal-addresses.vala            |    4 +-
 tests/tracker/set-roles.vala                       |    4 +-
 tests/tracker/set-urls.vala                        |    4 +-
 tools/inspect/inspect.vala                         |    2 +-
 45 files changed, 240 insertions(+), 285 deletions(-)

commit 19f77e2a6ca09fb74635c5387bd2e9a98aa7bfe3
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:   Sat Jul 21 01:25:01 2012 +0100

    Bug 660236 — Paging for long text in folks-inspect

    Use $PAGER to allow paging of the output of really long commands in
    folks-inspect.

    Based on work by Raúl Gutierrez Segales and Jeremy Whiting.

    Closes: https://bugzilla.gnome.org/show_bug.cgi?id=660236

 NEWS                       |    1 +
 tools/inspect/Makefile.am  |    1 +
 tools/inspect/inspect.vala |  320
 ++++++++++++++++++++++++++++++++++++--------
 tools/inspect/utils.vala   |    6 +-
 4 files changed, 268 insertions(+), 60 deletions(-)

commit 3a78f2dbc4d903be02f3969cfd8736749c717682
Author: Jeremy Whiting <jpwhiting@kde.org>
Date:   Mon Jul 23 12:52:18 2012 -0600

    Remove extra calls to set this._prepare_pending to false.

 backends/eds/lib/edsf-persona-store.vala         |    1 -
 backends/key-file/kf-persona-store.vala          |    3 ---
 backends/libsocialweb/lib/swf-persona-store.vala |    3 ---
 backends/libsocialweb/sw-backend.vala            |    4 ++--
 4 files changed, 2 insertions(+), 9 deletions(-)

commit 779f1ea93d54543548a49eb1649ea1f86fb0734f
Author: Jeremy Whiting <jpwhiting@kde.org>
Date:   Fri Jul 20 14:57:56 2012 -0600

    Removed locks in trf-persona-store that are not needed.
    Minor style fixes based on review of previous changes.

 backends/libsocialweb/lib/swf-persona-store.vala |   16 ++++-
 backends/libsocialweb/sw-backend.vala            |   66
 ++++++++++++----------
 backends/telepathy/lib/tpf-persona-store.vala    |    1 -
 backends/telepathy/tp-backend.vala               |    2 +
 backends/tracker/lib/trf-persona-store.vala      |   51 ++++++-----------
 tests/folks/async-locking.vala                   |    3 +
 6 files changed, 72 insertions(+), 67 deletions(-)

commit f598028e0a29c91c3aeff0fcb322a120bdde5118
Author: Jeremy Whiting <jpwhiting@kde.org>
Date:   Fri Jul 20 10:51:08 2012 -0600

    Remove additional locks around this._is_prepared.

 backends/eds/eds-backend.vala            |   94 ++++++++++------------
 backends/eds/lib/edsf-persona-store.vala |   31 ++-----
 backends/key-file/kf-backend.vala        |  130
 ++++++++++++++----------------
 backends/key-file/kf-persona-store.vala  |    1 -
 backends/libsocialweb/sw-backend.vala    |   84 ++++++++++---------
 backends/telepathy/tp-backend.vala       |   96 ++++++++++------------
 backends/tracker/tr-backend.vala         |   76 ++++++++---------
 folks/individual-aggregator.vala         |   77 +++++++++---------
 8 files changed, 275 insertions(+), 314 deletions(-)

commit 0a21e25cfd8753185e21653d1f0c5c3b85c38dab
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Wed Jul 6 18:13:36 2011 -0700

    Cut unnecessary locking in Tracker backend tests.

    Closes: bgo#652637 - Don't hold locks across async calls

 NEWS                                     |    1 +
 tests/tracker/add-persona.vala           |   10 +++-------
 tests/tracker/duplicated-emails.vala     |   10 +++-------
 tests/tracker/duplicated-phones.vala     |   10 +++-------
 tests/tracker/match-all.vala             |   10 +++-------
 tests/tracker/match-email-addresses.vala |   10 +++-------
 tests/tracker/match-im-addresses.vala    |   10 +++-------
 tests/tracker/match-known-emails.vala    |   10 +++-------
 tests/tracker/match-name.vala            |   10 +++-------
 tests/tracker/match-phone-number.vala    |   10 +++-------
 tests/tracker/set-duplicate-email.vala   |   10 +++-------
 11 files changed, 31 insertions(+), 70 deletions(-)

commit ddd1908733002e5159194e137c775ddb0022f904
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Wed Jul 6 17:54:01 2011 -0700

    Cut unnecessary Swf.PersonaStore._is_prepared locking.

    Helps: bgo#652637 - Don't hold locks across async calls

 backends/libsocialweb/lib/swf-persona-store.vala |  151
 +++++++++++-----------
 1 files changed, 74 insertions(+), 77 deletions(-)

commit 2c957a5d58c61dfb44b89babe2c7bfb11742b562
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Wed Jul 6 17:51:07 2011 -0700

    Cut unnecessary Kf.PersonaStore._is_prepared locking.

    Helps: bgo#652637 - Don't hold locks across async calls

 backends/key-file/kf-persona-store.vala |  218
 +++++++++++++++----------------
 1 files changed, 107 insertions(+), 111 deletions(-)

commit a875a1fad9f65b59c57198c72e83373840823304
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Wed Jul 6 17:39:40 2011 -0700

    Cut unnecessary Tpf.PersonaStore._is_prepared locking.

    Helps: bgo#652637 - Don't hold locks across async calls

 backends/telepathy/lib/tpf-persona-store.vala |  207
 ++++++++++++-------------
 1 files changed, 102 insertions(+), 105 deletions(-)

commit 7753697900fdb7943ac48e620676409f46f40c4d
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Wed Jul 6 17:21:56 2011 -0700

    Cut unnecessary Trf.PersonaStore._is_prepared locking.

    Helps: bgo#652637 - Don't hold locks across async calls

 backends/tracker/lib/trf-persona-store.vala |  153
 +++++++++++++--------------
 1 files changed, 75 insertions(+), 78 deletions(-)

commit 8303d317a57af3caf2521aa636327485f2e7e3b8
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Wed Jul 6 17:58:05 2011 -0700

    Prevent extra "concurrent" Aggregator prepare() calls from one thread.

    Helps: bgo#652637 - Don't hold locks across async calls

 folks/individual-aggregator.vala |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit d94b174d002d9304fff090c4eca8d1aa2930d6c6
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Wed Jul 6 14:48:43 2011 -0700

    Prevent extra "concurrent" PersonaStore.prepare() calls from one
    thread.

    The lock() calls which were in place only prevent concurrent
    calls from
    different threads; however, the critical section could still be
    reached
    from two async calls in the same thread a la:

    backend.prepare.begin ((s,r) => {...});
    backend.prepare.begin ((s,r) => {...});

    The bodies of the handlers would not literally execute concurrently,
    but
    would be interleaved if each were sufficiently long. Our fix simply
    ignores any calls which happen while one is still working.

    (yield backend.prepare(); yield backend.prepare(); was already
    safe, of
    course)

    Helps: bgo#652637 - Don't hold locks across async calls

 backends/key-file/kf-persona-store.vala       |    4 ++++
 backends/telepathy/lib/tpf-persona-store.vala |    1 +
 backends/tracker/lib/trf-persona-store.vala   |    4 ++++
 3 files changed, 9 insertions(+), 0 deletions(-)

commit 1492a80a0a05988b32b1d49895002a738c68ebfc
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Wed Jul 6 11:09:26 2011 -0700

    Add test cases for mutexing for async calls from the same thread.

    The standard Vala lock() call is a recursive lock, so it only prevents
    concurrent access between different threads. But we rarely run in
    distinct threads, so this test uses a more-complete solution that
    we can
    depend upon (since the test will fail if its assumptions ever
    change in
    Vala).

    Helps: bgo#652637 - Don't hold locks across async calls

 tests/folks/Makefile.am        |    6 ++
 tests/folks/async-locking.vala |  160
 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 166 insertions(+), 0 deletions(-)

commit 67f8e41bcc56fe1c38f7e6eb4b60ef5dc971549a
Author: Travis Reitter <travis.reitter@collabora.co.uk>
Date:   Tue Jul 5 14:36:49 2011 -0700

    Fix Tracker structure locking for user-initiated Persona adds.

    Helps: bgo#652637 - Don't hold locks across async calls

 backends/tracker/lib/trf-persona-store.vala |   52
 ++++++++++++++-------------
 1 files changed, 27 insertions(+), 25 deletions(-)

commit 35e6e8f5e4885ac272a357d287b3c3442f9051d0
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:   Mon Jul 23 12:27:16 2012 +0200

    Updated Norwegian bokmål translation

 po/nb.po |  186
 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 97 insertions(+), 89 deletions(-)

commit aefde69c13877c6c12298a2a930127c118073695
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:   Sun Jul 22 13:04:59 2012 +0100

    eds: Make some PersonaStore methods synchronous

    There was absolutely no point in them being asynchronous (they
    didn’t yield
    at all, and didn’t run any blocking operations), so were just
    generating
    excess C code and slowing everything down.

    This cuts 1200 lines from edsf-persona-store.c.

 backends/eds/lib/edsf-persona-store.vala |   86
 ++++++++++++++----------------
 1 files changed, 40 insertions(+), 46 deletions(-)

commit be282dda2e2913afce09d6140f405d96001c6d4b
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:   Sun Jul 22 09:10:29 2012 +0100

    eds: Hide the “Starred in Android” group from the set of groups

    For Google address books, it’s used to determine whether a contact
    is a
    favourite, so needn’t be shown in the set of groups.

    Note that this requires commit
    161faab40fa65e813ac98042ef822298dc58cfde
    from EDS in order to behave properly.

    See: https://bugzilla.gnome.org/show_bug.cgi?id=661490

 backends/eds/lib/edsf-persona-store.vala |   52 ++++++++------------
 backends/eds/lib/edsf-persona.vala       |   77
 ++++++++++-------------------
 2 files changed, 48 insertions(+), 81 deletions(-)

commit 95496d952b3be5bab1e8bcc0cd699a8af8088a7f
Author: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date:   Fri Jul 20 00:07:52 2012 +0300

    Added Belarusian translation.

 po/LINGUAS |    1 +
 po/be.po   |  672
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 673 insertions(+), 0 deletions(-)

commit 62f0cce53ddeb64f9934754b39af7adf3b3002ca
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:   Thu Jul 19 05:04:31 2012 +0100

    core: Fix documentation on GroupDetails.groups

    It was out of date and didn’t match the data type of
    GroupDetails.groups
    any more.

    See: https://bugzilla.gnome.org/show_bug.cgi?id=679743

 backends/telepathy/lib/tpf-persona.vala |    2 +-
 folks/group-details.vala                |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

commit c2338c651edd3fcdc3ef28c94d87351b8c6bae27
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:   Fri Jun 22 19:17:42 2012 +0100

    telepathy: Preserve Tpf.Persona avatars from the cache for online
    contacts

    This is a fairly hacky way of fixing the problem in bug #660128:
    maintaining
    a map of IIDs to avatar files for all personas in the Telepathy
    backend, and
    referring to it in case Telepathy doesn’t know the current avatar
    for a
    TpContact. This can happen if that contact is currently offline
    while we’re
    online, for example. This allows use of the avatars cached from
    last time
    contacts were online, even though those contacts are now offline.

    A more comprehensive fix, which I would have implemented if I hadn’t
    just got
    my degree classification and weren’t just heading out to celebrate,
    would
    involve rearchitecting the caching of the Telepathy backend so
    that the
    Tpf.Personas weren’t destroyed and re-created whenever the
    backend went
    offline/online; instead, they would have their properties updated
    from the
    cache/online contact list. This would eliminate spurious
    personas-changed
    signals, unify the code implementing the different properties
    (currently it’s
    split between the properties and separate implementations in
    Tpf.Persona.from_cache()), and allow property values to persist
    from offline
    to online without the need for hacks like this.

    Closes: https://bugzilla.gnome.org/show_bug.cgi?id=660128

 backends/telepathy/lib/tpf-persona-store.vala |   35 +++++++++++++++++++
 backends/telepathy/lib/tpf-persona.vala       |   46
 ++++++++++++++++++++++---
 2 files changed, 76 insertions(+), 5 deletions(-)

commit 36ecd01a58b952c40c985166aa74ededda7fcefc
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:   Fri Jun 22 19:09:57 2012 +0100

    telepathy: Allow for updated Tpf.Personas properties to update
    the cache

    Currently, the cache is only written when going offline, which means
    that any
    properties of Tpf.Personas which are updated at runtime aren’t
    written to the
    cache unless the client explicitly goes offline before being
    closed. This
    doesn’t often happen, meaning the property updates are lost and
    the cache
    becomes stale.

    This commit keeps track of the clean/dirty state of the cache and
    writes it
    out when PersonaStore.flush() is called. It also adds a new method,
    IndividualAggregator.unprepare(), which ensures all the persona
    stores handled
    by the aggregator are flushed. Clients should call this method
    before closing
    their main loop.

    (Calling flush() in the finalise function of the PersonaStore
    doesn’t work
    because Tpf.PersonaStores are often never finalised due to the
    implementation
    of Tpf.PersonaStore.dup_for_account(). Furthermore, calling flush()
    in the
    finalise function of the IndividualAggregator doesn’t work because
    the client
    will typically quit the main loop immediately afterwards, which
    will cancel
    the asynchronous flush call.)

    New API:
     • IndividualAggregator.unprepare()

    Helps: https://bugzilla.gnome.org/show_bug.cgi?id=660128

 NEWS                                          |    2 +
 backends/telepathy/lib/tpf-persona-store.vala |   72
 +++++++++++++++++++-----
 backends/telepathy/lib/tpf-persona.vala       |   24 ++++++++
 folks/individual-aggregator.vala              |   43 +++++++++++++++
 4 files changed, 126 insertions(+), 15 deletions(-)

commit 6f743fdc074910ff8f4d0b91753e82a0b2c92867
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:   Fri Jun 22 19:03:55 2012 +0100

    core: Don’t keep references to PersonaStores in each Individual

    Pointless and it makes debugging reference counting bugs a real pain.

 folks/individual.vala |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

commit 921686c334179b58545ead8726cb1684b3d7736c
Author: Jeremy Whiting <jpwhiting@kde.org>
Date:   Wed Jul 18 12:44:06 2012 -0600

    telepathy: Change warning about CM not implementing contact list to
    debug message.
    fixes: 675223

 NEWS                                          |    1 +
 backends/telepathy/lib/tpf-persona-store.vala |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

commit dfa96f91fe046e39861a15a305cc05ef9c9bbc5c
Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
Date:   Tue Jul 17 22:03:17 2012 +0200

    Updated Serbian translation

 po/sr.po       |    2 +-
 po/sr@latin.po |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

commit 93b5960af48e47dfe3e07e4f3aeda592c812d9bf
Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
Date:   Tue Jul 17 22:00:50 2012 +0200

    Added Serbian translation

 po/LINGUAS     |    2 +
 po/sr.po       |  686
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/sr@latin.po |  686
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 1374 insertions(+), 0 deletions(-)

commit 9d4ce6a116cfe4707c43135086bb850cf5b0be3c
Author: Jeremy Whiting <jpwhiting@kde.org>
Date:   Mon Jul 16 16:30:14 2012 -0600

    Update NEWS file adding recently fixed bug.

 NEWS |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 09e397b9bb690a17a7c80da6e098919d402aff9b
Author: Jeremy Whiting <jpwhiting@kde.org>
Date:   Mon Jul 16 16:10:33 2012 -0600

    eds: Trust google address books FULL since authorization is required
    to load.

 backends/eds/lib/edsf-persona-store.vala |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

commit aa1c25a54d928eca02385de20925c8f20421babb
Author: Jeremy Whiting <jpwhiting@kde.org>
Date:   Mon Jul 16 16:09:55 2012 -0600

    folks: Don't downgrade persona store trust level.

 folks/persona-store.vala |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)

commit 3485f63a16213542183498a41aa8b9bd5d75cb56
Author: Jeremy Whiting <jpwhiting@kde.org>
Date:   Mon Jul 16 15:37:49 2012 -0600

    tracker: Fix tracker unit tests to wait until persona store is
    prepared.

 tests/tracker/link-personas-via-local-ids.vala |   10 ++++++++--
 tests/tracker/link-personas.vala               |   10 ++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

commit cfcebbd6272db4efd7e88ae1aa999afc07bf4132
Author: Jeremy Whiting <jpwhiting@kde.org>
Date:   Mon Jul 16 15:30:16 2012 -0600

    tracker: Throw an error if personas are added before store is
    prepared.

 backends/tracker/lib/trf-persona-store.vala |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

commit 358e7d8cd7c62f7df4f0897922881ebebb19f925
Author: Jeremy Whiting <jpwhiting@kde.org>
Date:   Mon Jul 16 10:19:10 2012 -0600

    tests: Add execute-test.sh to do test output capturing.
    tests: Call execute-test.sh from each of with-session-bus scripts.

 tests/tools/execute-test.sh             |   28
 ++++++++++++++++++++++++++++
 tests/tools/with-session-bus-eds.sh     |    3 ++-
 tests/tools/with-session-bus-tracker.sh |    2 +-
 tests/tools/with-session-bus.sh         |   18 ++----------------
 4 files changed, 33 insertions(+), 18 deletions(-)

commit ebb44f51171db5f9ee013333f82ba2d0018f23e7
Author: Jeremy Whiting <jpwhiting@kde.org>
Date:   Mon Jul 16 10:16:39 2012 -0600

    Send eds server debug output into /dev/null along with regular output.
    Extend sleep time to 2 seconds.

 tests/tools/eds.sh |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

commit d2e60d68156c101e5ba65760b1f4867058f9c6ee
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:   Mon Jul 16 16:42:24 2012 +0200

    Updated Spanish translation

 po/es.po |  213
 ++++++++++++++++++++++++++++++--------------------------------
 1 files changed, 102 insertions(+), 111 deletions(-)

commit 65fc62d7b5e403b040ac1a2c2faa754d84ddb937
Author: Aurimas Černius <aurisc4@gmail.com>
Date:   Sat Jul 14 14:59:28 2012 +0300

    Added Lithuanian translation

 po/LINGUAS |    1 +
 po/lt.po   |  647
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 648 insertions(+), 0 deletions(-)

commit 90ea3d0b130e4137cbf23e18f80eca9cf306e471
Author: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>
Date:   Sat Jul 14 13:40:54 2012 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/LINGUAS  |    2 +
 po/zh_HK.po |  659
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 po/zh_TW.po |  664
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 1325 insertions(+), 0 deletions(-)

commit 4efd37460b929233404dc84e6923611f901e7aac
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:   Fri Jul 13 23:17:33 2012 +0100

    telepathy: Tidy up group change notification handling in Tpf.Persona

 backends/telepathy/lib/tpf-persona.vala |   36
 +++++++++++++------------------
 1 files changed, 15 insertions(+), 21 deletions(-)

commit 85e8d88f2dae0480d9804f6e60f9e6575cb9488a
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:   Sun Jun 24 11:50:06 2012 +0100

    eds: Add an Edsf.Persona.in_google_personal_group property

    This is set whenever the persona is in the “My Contacts” group
    in Google
    Contacts, which is normally exposed by EDS as being in the
    “Personal”
    category. This system group can’t be reliably detected normally
    as “Personal”
    is translated by EDS. This caused problems for gnome-contacts,
    hence the
    new API.

    The new API requires EDS 3.5.3 at runtime, and will always be false
    otherwise.

    Helps: https://bugzilla.gnome.org/show_bug.cgi?id=676383

 NEWS                               |    3 +-
 backends/eds/lib/edsf-persona.vala |   47
 +++++++++++++++++++++++++++++++++++-
 2 files changed, 48 insertions(+), 2 deletions(-)

commit 134c64b5fcf576c3b989c8d468cad82e4b0813fd
Author: Jeremy Whiting <jpwhiting@kde.org>
Date:   Tue Jul 10 14:48:59 2012 -0600

    Remove gconf soft dependency used for eds unit tests.
    Fixes: bgo 674611

 configure.ac                        |    6 ----
 folks/Makefile.am                   |    1 -
 tests/data/Makefile.am              |   19 ------------
 tests/data/gconf.path.in            |   54
 -----------------------------------
 tests/eds/Makefile.am               |    1 -
 tests/folks/Makefile.am             |    1 -
 tests/libsocialweb/Makefile.am      |    1 -
 tests/tools/with-session-bus-eds.sh |    4 --
 tests/tracker/Makefile.am           |    1 -
 9 files changed, 0 insertions(+), 88 deletions(-)

commit 0b36298ec59d971e41210d0e31d2ae1118453a33
Author: Jeremy Whiting <jpwhiting@kde.org>
Date:   Fri Jul 13 15:11:27 2012 -0600

    Add a sleep for one second after starting the eds servers.
    Fixes inconsistent eds unit test failures.  All tests pass here now.

 tests/tools/eds.sh |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 91e9b0d9258155cb6e8a4a7af83a890f65e861b7
Author: Jeremy Whiting <jpwhiting@kde.org>
Date:   Fri Jul 13 10:59:39 2012 -0600

    telepathy: Set _prepare_pending to true at beginning of prepare.
    Fixes folks init unit test failure.

 backends/telepathy/tp-backend.vala |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

commit 162919a17115663060887e8041a7b17514ecea26
Merge: 553b3e1 fc98984
Author: Jeremy Whiting <jpwhiting@kde.org>
Date:   Thu Jul 12 14:22:41 2012 -0600

    Merge branch 'cleantestoutput'
    Reviewed-by: Philip Withnal
    Closes: bgo 657456 https://bugzilla.gnome.org/show_bug.cgi?id=657456

commit 553b3e12454281604b48c27c5b14a6cfc746d142
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:   Mon Jul 9 21:18:41 2012 +0100

    Bug 679618 — Crash when unsetting all groups

    Rework the group changing code in Tpf.Persona so that:
     1. change_groups() no longer changes the set of groups while
     iterating
        over it; and
     2. batch Telepathy calls are made where possible, rather than one
     call per
        group change.

    Closes: https://bugzilla.gnome.org/show_bug.cgi?id=679618

 NEWS                                    |    1 +
 backends/telepathy/lib/tpf-persona.vala |   30
 ++++++++++--------------------
 2 files changed, 11 insertions(+), 20 deletions(-)

commit fc98984b1d70dcb3df480ce412817ac3e5de922d
Author: Jeremy Whiting <jpwhiting@kde.org>
Date:   Tue Jul 10 14:22:29 2012 -0600

    Make test output use color for PASS/FAIL.
    Don't show test output unless CHECK_VERBOSE is set.
    Fixes: bgo 657456

 configure.ac                    |    2 +-
 tests/tools/with-session-bus.sh |   17 +++++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

commit 9cc834fc7a2af401de11232471186f914634cd8f
Author: Kjartan Maraas <kmaraas@gnome.org>
Date:   Mon Jul 9 14:33:34 2012 +0200

    Updated Norwegian bokmål translation

 po/nb.po |  230
 ++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 121 insertions(+), 109 deletions(-)

commit 59ec2ec9dd8519ed4220015b760c4d0e95f1db03
Author: Bruno Brouard <annoa.b@gmail.com>
Date:   Sun Jul 8 11:28:19 2012 +0200

    New French translation

 po/LINGUAS |    1 +
 po/fr.po   |  708
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 709 insertions(+), 0 deletions(-)

commit 675574faba2fe9fbb4e9c663f6a1a79acf7f5d3e
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:   Sat Jul 7 22:58:13 2012 +0200

    Updated POTFILES.in and POTFILES.skip

 po/POTFILES.in   |    1 +
 po/POTFILES.skip |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)

commit 9ccd3a11b8baef9378afd453b96df0e7396117f5
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:   Sun May 6 22:59:45 2012 +0100

    key-file: Add anti-linking support

    Helps: https://bugzilla.gnome.org/show_bug.cgi?id=629537

 backends/key-file/kf-persona-store.vala |    5 ++-
 backends/key-file/kf-persona.vala       |   70
 ++++++++++++++++++++++++++++++-
 2 files changed, 73 insertions(+), 2 deletions(-)

commit a87ba87ae231f2c2f511fad804c8cfd8da4c82e3
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:   Sun May 6 22:59:34 2012 +0100

    eds: Add anti-linking support

    Helps: https://bugzilla.gnome.org/show_bug.cgi?id=629537

 backends/eds/lib/edsf-persona-store.vala |   53
 +++++++++++++++++++++++++--
 backends/eds/lib/edsf-persona.vala       |   59
 ++++++++++++++++++++++++++++++
 2 files changed, 109 insertions(+), 3 deletions(-)

commit 1441ae9ddda3dfba8a67d18ecc6a75e16d389553
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:   Mon Jul 25 20:27:29 2011 +0100

    core: Add core anti-linking support

    This adds the core of the anti-linking support, based around a new
    AntiLinkable interface. This will be implemented by Persona subclasses
    which
    can store anti-linking information (in the form of a set of Persona
    UIDs
    which the given Persona should never be linked to).

    This approach allows anti-linking information to be stored with
    the personas
    (presumably in the primary persona store) and thus it should be
    network
    transparent. i.e. Using folks on two different computers with a Google
    Contacts address book as primary should cause the anti-linking data
    to be
    shared.

    This also includes the necessary IndividualAggregator changes.

    Sadly, no unit tests are included.

    Closes: https://bugzilla.gnome.org/show_bug.cgi?id=629537

 NEWS                             |    3 +-
 folks/Makefile.am                |    1 +
 folks/anti-linkable.vala         |  157
 ++++++++++++++++++++++++++++++++++++++
 folks/individual-aggregator.vala |  117 ++++++++++++++++++++++++-----
 folks/individual.vala            |   60 ++++++++++++++
 folks/persona-store.vala         |   12 +++-
 folks/potential-match.vala       |   10 ++-
 tools/inspect/utils.vala         |    3 +-
 8 files changed, 339 insertions(+), 24 deletions(-)

commit 2f442b4906a9c0f2c44a7d65e379f695e74cf701
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:   Tue May 8 00:01:42 2012 +0100

    core: Replace the linking step in
    IA.ensure_individual_property_writeable()

    It’s a waste of time to create a new Persona to ensure the
    property is
    writeable, then create _another_ new Persona to link it to the
    Individual.
    Why not just create the writeable Persona so that it’s automatically
    linked
    to the Individual?

    Helps: https://bugzilla.gnome.org/show_bug.cgi?id=629537

 folks/individual-aggregator.vala |   31 ++++++++++++++-----------------
 1 files changed, 14 insertions(+), 17 deletions(-)

commit 34e0b4428332291896d10285aa3f610537a8cf1b
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:   Mon May 7 23:59:56 2012 +0100

    core: Split details table code out of IA.link_personas()

    Helps: https://bugzilla.gnome.org/show_bug.cgi?id=629537

 folks/individual-aggregator.vala |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

commit 787c0769dee8f31f8d9372eaf7a69057677832b0
Author: Philip Withnall <philip@tecnocode.co.uk>
Date:   Thu Dec 8 10:18:25 2011 +0000

    aggregator: Convert the link map to use a MultiMap

    When it's possible to have personas sharing IM addresses but not being
    linked (due to anti-links), the link map's assumption that one
    IM address
    (or other linkable property) maps to one individual will be
    invalid. This
    commit converts the link map to be a HashMultiMap, effectively
    changing it
    from a mapping of string → Individual to a mapping of
    string → Set<Individual>.

    Helps: bgo#629537

 folks/individual-aggregator.vala |  123
 +++++++++++++++++++++++---------------
 1 files changed, 74 insertions(+), 49 deletions(-)

commit 70a24fe7ce536836dabd5bfd8df4af6ca221b6b3
Author: Jeremy Whiting <jpwhiting@kde.org>
Date:   Fri Jul 6 14:23:59 2012 -0600

    Change urls to links in doc comments, fixes doc creation.

 folks/abstract-field-details.vala |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

commit 10a93e01242e8469adbf7e2813e296f966aefaa2
Author: Jeremy Whiting <jpwhiting@kde.org>
Date:   Fri Jul 6 09:22:56 2012 -0600

    Add bugfix and dependency change to NEWS.

 NEWS |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

commit 6c098372cd3f8b77930eb016439326643bdc3f1f
Merge: b67a111 e069bbe
Author: Jeremy Whiting <jpwhiting@kde.org>
Date:   Fri Jul 6 09:18:51 2012 -0600

    Merge branch libgeetest which upgrades our libgee dependency.
    Fixes bug https://bugzilla.gnome.org/show_bug.cgi?id=673918

commit e069bbe59dc54eb3595d8ee5c96aea4a36cff9aa
Author: Jeremy Whiting <jpwhiting@kde.org>
Date:   Wed Jul 4 13:11:48 2012 -0600

    Port folks to libgee 0.8.
    Added hash_static and equal_static to AbstractFieldDetails.
    Use AbstractFieldDetails hash_static and equal_static where needed.

 backends/eds/lib/edsf-persona.vala                 |   60
 ++++++++++----------
 backends/key-file/kf-persona.vala                  |   15 +++--
 backends/libsocialweb/lib/swf-persona.vala         |   11 ++--
 .../telepathy/lib/tpf-persona-store-cache.vala     |   12 ++--
 backends/telepathy/lib/tpf-persona.vala            |   28 +++++-----
 backends/tracker/lib/trf-persona-store.vala        |    4 +-
 backends/tracker/lib/trf-persona.vala              |   52
 +++++++++---------
 folks/abstract-field-details.vala                  |   48
 ++++++++++++++++
 folks/backend-store.vala                           |    9 +--
 folks/debug.vala                                   |    2 +-
 folks/individual-aggregator.vala                   |    8 +-
 folks/individual.vala                              |   47
 ++++++++--------
 folks/potential-match.vala                         |    2 +-
 tests/eds/add-persona.vala                         |   20 +++---
 tests/eds/email-details.vala                       |    3 +-
 tests/eds/individual-retrieval.vala                |    3 +-
 tests/eds/link-personas.vala                       |   20 +++---
 tests/eds/phone-details.vala                       |    3 +-
 tests/eds/set-emails.vala                          |    4 +-
 tests/eds/set-im-addresses.vala                    |    4 +-
 tests/eds/set-phones.vala                          |    4 +-
 tests/eds/set-roles.vala                           |    4 +-
 tests/folks/aggregation.vala                       |    2 +-
 tests/folks/backend-loading.vala                   |   12 ++--
 tests/key-file/individual-retrieval.vala           |    3 +-
 tests/telepathy/individual-properties.vala         |   12 ++--
 tests/telepathy/individual-retrieval.vala          |    7 +-
 tests/tracker/add-persona.vala                     |   28 +++++-----
 tests/tracker/duplicated-emails.vala               |    8 +-
 tests/tracker/duplicated-phones.vala               |    8 +-
 tests/tracker/link-personas.vala                   |    8 +-
 tests/tracker/match-email-addresses.vala           |    8 +-
 tests/tracker/match-im-addresses.vala              |    8 +-
 tests/tracker/match-known-emails.vala              |    8 +-
 tests/tracker/match-phone-number.vala              |    8 +-
 tests/tracker/remove-persona.vala                  |    4 +-
 tests/tracker/set-duplicate-email.vala             |    8 +-
 tests/tracker/set-emails.vala                      |    4 +-
 tests/tracker/set-im-addresses.vala                |    4 +-
 tests/tracker/set-notes.vala                       |    4 +-
 tests/tracker/set-phones.vala                      |    4 +-
 tests/tracker/set-postal-addresses.vala            |    4 +-
 tests/tracker/set-roles.vala                       |    4 +-
 tests/tracker/set-urls.vala                        |    4 +-
 tools/inspect/inspect.vala                         |    2 +-
 45 files changed, 285 insertions(+), 240 deletions(-)

commit b67a111d6f23b0943af42ca202099f9d1a3c350b
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Mon Jul 2 09:01:36 2012 +0200

    backend-store: never translate warning messages

    Most of them were not translated.

    https://bugzilla.gnome.org/show_bug.cgi?id=679116

 folks/backend-store.vala |   15 ++++-----------
 1 files changed, 4 insertions(+), 11 deletions(-)

commit 8034c354272e49dfc83039e8f68502f1a1223207
Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date:   Fri Jun 29 11:54:57 2012 +0200

    backend-store: output a debug message if mime type of potential
    backends looks weird

    Will make my life much easier next time I'm wondering why nothing
    is working.

    https://bugzilla.gnome.org/show_bug.cgi?id=679116

 folks/backend-store.vala |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

commit 88a3eb48d007971cd47900b44a8ee1b75f668841
Author: Khaled Hosny <khaledhosny@eglug.org>
Date:   Fri Jul 6 06:02:13 2012 +0200

    Arabic translation

 po/LINGUAS |    1 +
 po/ar.po   |  675
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 676 insertions(+), 0 deletions(-)

commit 5b5360bff7a61ef17173cbe35cc32712ca0fc329
Author: Jeremy Whiting <jpwhiting@kde.org>
Date:   Wed Jul 4 09:37:47 2012 -0600

    Change libgee dependency from 0.6 to 0.8.

 backends/eds/Makefile.am                           |    2 +-
 backends/eds/lib/Makefile.am                       |    2 +-
 backends/eds/lib/folks-eds-uninstalled.pc.in       |    2 +-
 backends/eds/lib/folks-eds.deps                    |    2 +-
 backends/eds/lib/folks-eds.pc.in                   |    2 +-
 backends/key-file/Makefile.am                      |    2 +-
 backends/libsocialweb/Makefile.am                  |    2 +-
 backends/libsocialweb/lib/Makefile.am              |    4 ++--
 .../lib/folks-libsocialweb-uninstalled.pc.in       |    2 +-
 backends/libsocialweb/lib/folks-libsocialweb.pc.in |    2 +-
 backends/telepathy/Makefile.am                     |    2 +-
 backends/telepathy/lib/Makefile.am                 |    2 +-
 .../lib/folks-telepathy-uninstalled.pc.in          |    2 +-
 backends/telepathy/lib/folks-telepathy.pc.in       |    2 +-
 backends/tracker/Makefile.am                       |    2 +-
 backends/tracker/lib/Makefile.am                   |    4 ++--
 .../tracker/lib/folks-tracker-uninstalled.pc.in    |    2 +-
 backends/tracker/lib/folks-tracker.pc.in           |    2 +-
 configure.ac                                       |   17
 +++--------------
 docs/Makefile.am                                   |    8 ++++----
 folks/Makefile.am                                  |    5 +++--
 folks/folks-uninstalled.pc.in                      |    2 +-
 folks/folks.deps                                   |    2 +-
 folks/folks.pc.in                                  |    2 +-
 tests/eds/Makefile.am                              |    2 +-
 tests/folks/Makefile.am                            |    2 +-
 tests/key-file/Makefile.am                         |    2 +-
 tests/lib/Makefile.am                              |    2 +-
 tests/lib/eds/Makefile.am                          |    2 +-
 tests/lib/libsocialweb/Makefile.am                 |    2 +-
 tests/lib/telepathy/contactlist/Makefile.am        |    2 +-
 tests/lib/tracker/Makefile.am                      |    2 +-
 tests/libsocialweb/Makefile.am                     |    2 +-
 tests/telepathy/Makefile.am                        |    2 +-
 tests/tracker/Makefile.am                          |    2 +-
 tools/Makefile.am                                  |    2 +-
 tools/inspect/Makefile.am                          |    2 +-
 37 files changed, 46 insertions(+), 56 deletions(-)

commit 42bbfe492850c760a4fc46d9b2c7cba944477280
Author: Jeremy Whiting <jpwhiting@kde.org>
Date:   Wed Jul 4 17:10:27 2012 -0600

    Port away from tp_connection_new since it has been deprecated.
    Synced some sources from telepathy-glib/tests/lib/.

 tests/lib/telepathy/contactlist/backend.c          |    6 +++-
 .../telepathy/contactlist/contact-list-manager.c   |    5 ++-
 tests/lib/telepathy/contactlist/contacts-conn.c    |    9 +++----
 tests/lib/telepathy/contactlist/simple-conn.c      |   23
 +++++++++----------
 tests/lib/telepathy/contactlist/textchan-null.c    |    6 +++-
 tests/lib/telepathy/contactlist/util.c             |    7 ++++-
 6 files changed, 31 insertions(+), 25 deletions(-)

commit 5969d728456585f1414e2dc3b532815700174c4f
Author: Jeremy Whiting <jpwhiting@kde.org>
Date:   Wed Jul 4 09:38:52 2012 -0600

    Get libexecdir from libedata-book-1.2.pc.

 tests/tools/eds.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

commit 8d32f92f0f946c79c48f4db0ecc415247c2e2e70
Author: Jeremy Whiting <jpwhiting@kde.org>
Date:   Tue Jul 3 10:23:05 2012 -0600

    Bump released bit back to 0.
    Change dependency in NEWS from 3.5.4 to 3.5.3.1

 NEWS         |    2 +-
 configure.ac |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)