[folks/wip/arbitrary-field-interface: 31/31] Merge branch 'master' into wip/arbitrary-field-interface
- From: Rodrigo Moya <rodrigo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [folks/wip/arbitrary-field-interface: 31/31] Merge branch 'master' into wip/arbitrary-field-interface
- Date: Wed, 25 Sep 2013 08:10:19 +0000 (UTC)
commit 12910eb18f18d33ae57240d7a5b8b39ce8f60129
Merge: 73500c8 f707b60
Author: Rodrigo Moya <rodrigo gnome-db org>
Date: Wed Sep 25 10:10:12 2013 +0200
Merge branch 'master' into wip/arbitrary-field-interface
Makefile.am | 2 +-
NEWS | 43 ++
backends/eds/lib/Makefile.am | 44 +-
backends/libsocialweb/lib/Makefile.am | 40 +-
backends/telepathy/lib/Makefile.am | 55 +--
backends/telepathy/lib/tpf-persona-store.vala | 2 +
backends/telepathy/lib/tpf-persona.vala | 70 +--
backends/tracker/lib/Makefile.am | 40 +-
configure.ac | 10 +-
folks/folks-generics.vapi | 1 +
folks/individual-aggregator.vala | 99 +++-
folks/individual.vala | 4 +-
folks/location-details.vala | 20 +-
folks/phone-details.vala | 5 +-
folks/presence-details.vala | 2 +-
folks/small-set.c | 1 +
po/LINGUAS | 1 +
po/eu.po | 170 +++---
po/fi.po | 683 ++++++++++++++++++++
po/zh_CN.po | 134 ++--
tests/eds/add-contacts-stress-test.vala | 2 +-
tests/eds/add-persona.vala | 2 +-
tests/eds/anti-linking.vala | 4 +-
tests/eds/avatar-details.vala | 2 +-
tests/eds/create-remove-stores.vala | 2 +-
tests/eds/email-details.vala | 2 +-
tests/eds/enable-disable-stores.vala | 2 +-
tests/eds/helper-prepare-aggregator.vala | 2 +-
tests/eds/im-details.vala | 2 +-
tests/eds/individual-retrieval.vala | 2 +-
tests/eds/link-personas-diff-stores.vala | 2 +-
tests/eds/link-personas.vala | 2 +-
tests/eds/linkable-properties.vala | 2 +-
tests/eds/name-details.vala | 2 +-
tests/eds/perf.vala | 2 +-
tests/eds/phone-details.vala | 2 +-
tests/eds/postal-address-details.vala | 2 +-
tests/eds/remove-persona.vala | 2 +-
tests/eds/removing-contacts.vala | 2 +-
tests/eds/set-avatar.vala | 4 +-
tests/eds/set-birthday.vala | 2 +-
tests/eds/set-emails.vala | 2 +-
tests/eds/set-gender.vala | 2 +-
tests/eds/set-im-addresses.vala | 2 +-
tests/eds/set-is-favourite.vala | 2 +-
tests/eds/set-names.vala | 2 +-
tests/eds/set-notes.vala | 2 +-
tests/eds/set-phones.vala | 2 +-
tests/eds/set-postal-addresses.vala | 2 +-
tests/eds/set-properties-race.vala | 2 +-
tests/eds/set-roles.vala | 2 +-
tests/eds/set-structured-name.vala | 2 +-
tests/eds/set-urls.vala | 2 +-
tests/eds/store-removed.vala | 2 +-
tests/eds/updating-contacts.vala | 2 +-
tests/folks/Makefile.am | 5 +
tests/folks/aggregation.vala | 18 +-
tests/folks/init.vala | 4 +-
tests/folks/phone-field-details.vala | 66 ++
tests/key-file/individual-retrieval.vala | 20 +-
tests/lib/telepathy/contactlist/Makefile.am | 5 +-
tests/libsocialweb/aggregation.vala | 2 +-
tests/libsocialweb/dummy-lsw.vala | 2 +-
tests/telepathy/fake-tp-backend.vala | 2 +-
tests/telepathy/individual-properties.vala | 8 +-
tests/telepathy/individual-retrieval.vala | 4 +-
tests/telepathy/individual-zeitgeist.vala | 2 +-
tests/telepathy/init.vala | 2 +-
tests/tracker/add-contact.vala | 2 +-
tests/tracker/add-persona.vala | 2 +-
tests/tracker/additional-names-updates.vala | 2 +-
tests/tracker/avatar-details-interface.vala | 2 +-
tests/tracker/avatar-updates.vala | 2 +-
tests/tracker/birthday-details-interface.vala | 2 +-
tests/tracker/birthday-updates.vala | 2 +-
tests/tracker/default-contact.vala | 2 +-
tests/tracker/duplicated-emails.vala | 2 +-
tests/tracker/duplicated-phones.vala | 2 +-
tests/tracker/email-details-interface.vala | 2 +-
tests/tracker/emails-updates.vala | 2 +-
tests/tracker/family-name-updates.vala | 2 +-
tests/tracker/favourite-details-interface.vala | 2 +-
tests/tracker/favourite-updates.vala | 2 +-
tests/tracker/fullname-updates.vala | 2 +-
tests/tracker/gender-details-interface.vala | 2 +-
tests/tracker/given-name-updates.vala | 2 +-
tests/tracker/im-details-interface.vala | 2 +-
tests/tracker/imaddresses-updates.vala | 2 +-
tests/tracker/individual-retrieval.vala | 2 +-
tests/tracker/link-personas-via-local-ids.vala | 2 +-
tests/tracker/link-personas.vala | 2 +-
tests/tracker/match-all.vala | 2 +-
tests/tracker/match-email-addresses.vala | 2 +-
tests/tracker/match-im-addresses.vala | 2 +-
tests/tracker/match-known-emails.vala | 2 +-
tests/tracker/match-name.vala | 2 +-
tests/tracker/match-phone-number.vala | 2 +-
tests/tracker/name-details-interface.vala | 2 +-
tests/tracker/nickname-updates.vala | 2 +-
tests/tracker/note-details-interface.vala | 2 +-
tests/tracker/phone-details-interface.vala | 2 +-
tests/tracker/phones-updates.vala | 2 +-
.../tracker/postal-address-details-interface.vala | 2 +-
tests/tracker/prefix-name-updates.vala | 2 +-
tests/tracker/remove-contact.vala | 2 +-
tests/tracker/remove-persona.vala | 2 +-
tests/tracker/role-details-interface.vala | 2 +-
tests/tracker/set-avatar.vala | 2 +-
tests/tracker/set-birthday.vala | 2 +-
tests/tracker/set-duplicate-email.vala | 2 +-
tests/tracker/set-emails.vala | 2 +-
tests/tracker/set-favourite.vala | 2 +-
tests/tracker/set-full-name.vala | 2 +-
tests/tracker/set-gender.vala | 2 +-
tests/tracker/set-im-addresses.vala | 2 +-
tests/tracker/set-nickname.vala | 2 +-
tests/tracker/set-notes.vala | 2 +-
tests/tracker/set-null-avatar.vala | 2 +-
tests/tracker/set-phones.vala | 2 +-
tests/tracker/set-postal-addresses.vala | 2 +-
tests/tracker/set-roles.vala | 2 +-
tests/tracker/set-structured-name.vala | 2 +-
tests/tracker/set-urls.vala | 2 +-
tests/tracker/suffix-name-updates.vala | 2 +-
tests/tracker/url-details-interface.vala | 2 +-
tests/tracker/website-updates.vala | 2 +-
tools/import.vala | 2 +-
tools/inspect/inspect.vala | 2 +-
128 files changed, 1273 insertions(+), 487 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
