[folks/next: 127/132] Merge branch 'master' into next
- From: Guillaume Desmottes <gdesmott src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [folks/next: 127/132] Merge branch 'master' into next
- Date: Thu, 13 Feb 2014 11:28:45 +0000 (UTC)
commit cc3576938915c8cf54b2f63d55bcf25a91da3a02
Merge: 5e956ac 26d59c7
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Mon Feb 3 15:37:09 2014 +0100
Merge branch 'master' into next
Conflicts:
backends/telepathy/Makefile.am
backends/telepathy/lib/Makefile.am
backends/telepathy/lib/tpf-persona-store.vala
tests/telepathy/Makefile.am
HACKING | 28 +-
Makefile.am | 23 +-
NEWS | 44 +-
README | 3 +-
backends/Makefile.am | 12 +
backends/backend-library.mk | 195 ++++
backends/backend.mk | 83 ++
backends/bluez/Makefile.am | 41 +
backends/bluez/bluez-backend-factory.vala | 73 ++
backends/bluez/bluez-backend.vala | 707 ++++++++++++
backends/bluez/bluez-persona-store.vala | 1058 ++++++++++++++++++
backends/bluez/bluez-persona.vala | 410 +++++++
backends/bluez/org-bluez-obex-client.vala | 99 ++
backends/bluez/org-bluez.vala | 116 ++
backends/dummy/Makefile.am | 40 +
backends/dummy/dummy-backend-factory.vala | 49 +
backends/dummy/lib/Makefile.am | 46 +
backends/dummy/lib/dummy-backend.vala | 394 +++++++
backends/dummy/lib/dummy-full-persona.vala | 1139 ++++++++++++++++++++
backends/dummy/lib/dummy-persona-store.vala | 1079 ++++++++++++++++++
backends/dummy/lib/dummy-persona.vala | 312 ++++++
backends/dummy/lib/folks-dummy-uninstalled.pc.in | 12 +
backends/dummy/lib/folks-dummy.deps | 4 +
backends/dummy/lib/folks-dummy.pc.in | 15 +
backends/eds/Makefile.am | 44 +-
backends/eds/backend.mk | 1 -
backends/eds/eds-backend-factory.vala | 27 +-
backends/eds/eds-backend.vala | 46 +-
backends/eds/lib/Makefile.am | 136 +--
backends/eds/lib/edsf-namespace.vala | 30 -
backends/eds/lib/edsf-persona-store.vala | 7 +-
backends/eds/lib/edsf-persona.vala | 48 +-
backends/eds/lib/folks-eds-uninstalled.pc.in | 2 +-
backends/key-file/Makefile.am | 48 +-
backends/key-file/kf-backend-factory.vala | 25 +-
backends/key-file/kf-backend.vala | 4 +
backends/key-file/kf-persona-store.vala | 3 +-
backends/key-file/kf-persona.vala | 6 +-
backends/libsocialweb/Makefile.am | 50 +-
backends/libsocialweb/lib/Makefile.am | 129 +--
.../lib/folks-libsocialweb-uninstalled.pc.in | 2 +-
backends/libsocialweb/lib/swf-namespace.vala | 30 -
backends/libsocialweb/lib/swf-persona.vala | 8 +-
backends/libsocialweb/sw-backend-factory.vala | 25 +-
backends/libsocialweb/sw-backend.vala | 5 +
backends/ofono/Makefile.am | 59 +-
backends/ofono/ofono-backend-factory.vala | 23 +-
backends/ofono/ofono-backend.vala | 76 +-
backends/ofono/ofono-persona-store.vala | 4 +
backends/ofono/ofono-persona.vala | 7 +-
backends/telepathy/Makefile.am | 56 +-
backends/telepathy/lib/Makefile.am | 197 +---
backends/telepathy/lib/tp-zeitgeist-dummy.vala | 3 +-
backends/telepathy/lib/tp-zeitgeist.vala | 11 +-
backends/telepathy/lib/tpf-logger.vala | 2 +-
backends/telepathy/lib/tpf-namespace.vala | 30 -
backends/telepathy/lib/tpf-persona-store.vala | 2 +-
backends/telepathy/lib/tpf-persona.vala | 6 +-
backends/telepathy/tp-backend-factory.vala | 25 +-
backends/telepathy/tp-backend.vala | 5 +
backends/tracker/Makefile.am | 45 +-
backends/tracker/lib/Makefile.am | 120 +--
.../tracker/lib/folks-tracker-uninstalled.pc.in | 2 +-
backends/tracker/lib/trf-namespace.vala | 30 -
backends/tracker/lib/trf-persona-store.vala | 3 +-
backends/tracker/lib/trf-persona.vala | 26 +-
backends/tracker/tr-backend-factory.vala | 27 +-
backends/tracker/tr-backend.vala | 4 +
configure.ac | 169 +++-
docs/Makefile.am | 61 ++
folks.doap | 2 +-
folks/Makefile.am | 17 +
folks/backend-store.vala | 16 +-
folks/backend.vala | 2 +
folks/build-conf.vapi | 3 +
folks/individual-aggregator.vala | 32 +-
folks/individual.vala | 517 +++++++---
folks/internal.vala | 2 +
folks/name-details.vala | 193 ++++-
folks/object-cache.vala | 3 +-
folks/persona-store.vala | 48 +-
folks/persona.vala | 4 +-
folks/phone-details.vala | 70 +-
folks/warnings.h | 85 ++
git.mk | 61 +-
po/POTFILES.in | 3 +
po/POTFILES.skip | 3 +
po/as.po | 339 ++++--
po/cs.po | 330 ++++--
po/de.po | 386 +++++--
po/el.po | 379 +++++--
po/es.po | 404 +++++--
po/gl.po | 372 +++++--
po/hu.po | 345 ++++--
po/id.po | 341 ++++--
po/lt.po | 336 ++++--
po/pa.po | 336 ++++--
po/pl.po | 339 ++++--
po/pt_BR.po | 484 +++++----
po/sl.po | 346 +++++--
po/sr.po | 339 ++++--
po/sr latin po | 339 ++++--
po/ta.po | 396 +++++--
po/zh_CN.po | 331 ++++--
po/zh_HK.po | 320 ++++--
po/zh_TW.po | 326 ++++--
tests/Makefile.am | 6 +
tests/dummy/Makefile.am | 41 +
tests/dummy/add-persona.vala | 449 ++++++++
tests/dummy/individual-retrieval.vala | 176 +++
tests/eds/Makefile.am | 64 +-
tests/folks/Makefile.am | 76 +-
tests/folks/name-details.vala | 137 +++
tests/folks/phone-field-details.vala | 3 +
tests/folks/standalone-individuals.vala | 153 +++
tests/key-file/Makefile.am | 40 +-
tests/lib/Makefile.am | 6 +-
tests/lib/disconnection-queue.vala | 70 ++
tests/lib/dummy/Makefile.am | 59 +
tests/lib/dummy/test-case.vala | 141 +++
tests/lib/eds/Makefile.am | 8 +-
tests/lib/key-file/Makefile.am | 8 +-
tests/lib/key-file/backend.vala | 22 +
tests/lib/libsocialweb/Makefile.am | 8 +-
tests/lib/telepathy/Makefile.am | 8 +-
tests/lib/telepathy/contactlist/Makefile.am | 6 +-
tests/lib/test-case-helper.c | 2 +-
tests/lib/test-case.vala | 1 +
tests/lib/test-utils.vala | 160 +++
tests/lib/tracker/Makefile.am | 8 +-
tests/libsocialweb/Makefile.am | 49 +-
tests/libsocialweb/aggregation.vala | 28 +-
tests/libsocialweb/dummy-lsw.vala | 12 +-
tests/telepathy/Makefile.am | 68 +-
tests/test.mk | 64 ++
tests/tracker/Makefile.am | 57 +-
tests/tracker/favourite-updates.vala | 2 +-
tools/Makefile.am | 5 +-
tools/inspect/Makefile.am | 5 +-
139 files changed, 13770 insertions(+), 3672 deletions(-)
---
diff --cc backends/telepathy/Makefile.am
index 6e036d1,1a86292..78833be
--- a/backends/telepathy/Makefile.am
+++ b/backends/telepathy/Makefile.am
@@@ -1,29 -1,21 +1,21 @@@
- SUBDIRS = lib
+ SUBDIRS = lib .
+ include $(top_srcdir)/backends/backend.mk
BACKEND_NAME = "telepathy"
+ backenddir = $(BACKEND_DIR)/telepathy
+ backend_LTLIBRARIES = telepathy.la
+
telepathy_la_VALAFLAGS = \
- $(AM_VALAFLAGS) \
- $(ERROR_VALAFLAGS) \
- --vapidir=$(abs_srcdir) \
- --vapidir=$(abs_builddir) \
- --vapidir=$(abs_top_srcdir)/backends/telepathy/lib \
- --vapidir=$(abs_top_builddir)/backends/telepathy/lib \
- --vapidir=$(abs_top_srcdir)/folks \
- --vapidir=$(abs_top_builddir)/folks \
- --pkg folks \
- --pkg folks-internal \
+ $(backend_valaflags) \
+ --vapidir=$(top_srcdir)/backends/telepathy/lib \
+ --vapidir=$(top_builddir)/backends/telepathy/lib \
--pkg folks-telepathy \
- --pkg gee-0.8 \
- --pkg gio-2.0 \
- --pkg gobject-2.0 \
- --pkg telepathy-glib \
+ --pkg telepathy-glib-1 \
$(NULL)
- backenddir = $(BACKEND_DIR)/telepathy
- backend_LTLIBRARIES = telepathy.la
-
telepathy_la_SOURCES = \
+ $(backend_sources) \
tp-backend.vala \
tp-backend-factory.vala \
$(NULL)
diff --cc backends/telepathy/lib/Makefile.am
index 480d270,edc6a98..4a5b5fb
--- a/backends/telepathy/lib/Makefile.am
+++ b/backends/telepathy/lib/Makefile.am
@@@ -148,17 -126,9 +126,9 @@@ libtp_zeitgeist_dummy_la_LIBADD =
$(NULL)
libtp_zeitgeist_la_VALAFLAGS = \
- $(ERROR_VALAFLAGS) \
- $(AM_VALAFLAGS) \
- --vapidir=$(abs_top_srcdir)/folks \
- --vapidir=$(abs_top_builddir)/folks \
- --pkg gobject-2.0 \
- --pkg gio-2.0 \
- --pkg gee-0.8 \
+ $(backend_library_valaflags_generic) \
--pkg zeitgeist-2.0 \
- --pkg telepathy-glib \
+ --pkg telepathy-glib-1 \
- --pkg folks \
- --pkg build-conf \
--library tp-zeitgeist \
--vapi tp-zeitgeist.vapi \
-H tp-zeitgeist.h \
@@@ -211,26 -170,9 +170,9 @@@ libfolks_telepathy_la_SOURCES =
$(NULL)
libfolks_telepathy_la_VALAFLAGS = \
- $(AM_VALAFLAGS) \
- $(ERROR_VALAFLAGS) \
- --gir=FolksTelepathy-$(API_VERSION_DOT).gir \
- --library=folks-telepathy \
- --vapidir=$(abs_srcdir) \
- --vapidir=$(abs_builddir) \
- --vapidir=$(abs_top_srcdir)/folks \
- --vapidir=$(abs_top_builddir)/folks \
- --pkg folks \
- --pkg folks-generics \
- --pkg folks-internal \
+ $(backend_library_valaflags) \
--pkg tp-lowlevel \
- --pkg gobject-2.0 \
- --pkg gio-2.0 \
- --pkg gee-0.8 \
- --pkg telepathy-glib \
+ --pkg telepathy-glib-1 \
- --includedir folks \
- --library folks-telepathy \
- --vapi folks-telepathy.vapi \
- -H folks/folks-telepathy.h \
$(NULL)
if ENABLE_ZEITGEIST
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
