[folks: 3/3] Merge branch libgeetest which upgrades our libgee dependency. Fixes bug https://bugzilla.gnome.org/s

[Jeremy Whiting <jpwhiting src gnome org>]

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

 backends/eds/Makefile.am                           |    2 +-
 backends/eds/lib/Makefile.am                       |    2 +-
 backends/eds/lib/edsf-persona.vala                 |   60 ++++++++++----------
 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/key-file/kf-persona.vala                  |   15 +++--
 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/libsocialweb/lib/swf-persona.vala         |   11 ++--
 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 +-
 .../telepathy/lib/tpf-persona-store-cache.vala     |   12 ++--
 backends/telepathy/lib/tpf-persona.vala            |   28 +++++-----
 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 +-
 backends/tracker/lib/trf-persona-store.vala        |    4 +-
 backends/tracker/lib/trf-persona.vala              |   52 +++++++++---------
 configure.ac                                       |   17 +-----
 docs/Makefile.am                                   |    8 +-
 folks/Makefile.am                                  |    5 +-
 folks/abstract-field-details.vala                  |   48 ++++++++++++++++
 folks/backend-store.vala                           |    9 +--
 folks/debug.vala                                   |    2 +-
 folks/folks-uninstalled.pc.in                      |    2 +-
 folks/folks.deps                                   |    2 +-
 folks/folks.pc.in                                  |    2 +-
 folks/individual-aggregator.vala                   |    8 +-
 folks/individual.vala                              |   47 ++++++++--------
 folks/potential-match.vala                         |    2 +-
 tests/eds/Makefile.am                              |    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/Makefile.am                            |    2 +-
 tests/folks/aggregation.vala                       |    2 +-
 tests/folks/backend-loading.vala                   |   12 ++--
 tests/key-file/Makefile.am                         |    2 +-
 tests/key-file/individual-retrieval.vala           |    3 +-
 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/telepathy/individual-properties.vala         |   12 ++--
 tests/telepathy/individual-retrieval.vala          |    7 +-
 tests/tracker/Makefile.am                          |    2 +-
 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/Makefile.am                                  |    2 +-
 tools/inspect/Makefile.am                          |    2 +-
 tools/inspect/inspect.vala                         |    2 +-
 82 files changed, 331 insertions(+), 296 deletions(-)
---