[Pkg-telepathy-commits] [telepathy-glib-1] 102/212: Merge tag 'upstream/0.99.10' into debian
Simon McVittie
smcv at debian.org
Wed May 14 12:09:00 UTC 2014
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch debian
in repository telepathy-glib-1.
commit bc20e6ce8a44f03d77a791f15b62f49922a625d9
Merge: d6f2b7f c103a97
Author: Simon McVittie <smcv at debian.org>
Date: Thu Apr 3 16:34:51 2014 +0100
Merge tag 'upstream/0.99.10' into debian
Upstream version 0.99.10
Conflicts:
ChangeLog
NEWS
configure
configure.ac
docs/reference/telepathy-glib/html/TpBaseConnection.html
docs/reference/telepathy-glib/html/TpBaseConnectionManager.html
docs/reference/telepathy-glib/html/TpDebugClient.html
docs/reference/telepathy-glib/html/index.html
docs/reference/telepathy-glib/html/index.sgml
docs/reference/telepathy-glib/html/telepathy-glib-TpSvcInterface.html
docs/reference/telepathy-glib/html/telepathy-glib-account-manager.html
docs/reference/telepathy-glib/html/telepathy-glib-channel-dispatcher.html
docs/reference/telepathy-glib/html/telepathy-glib-connection-manager.html
docs/reference/telepathy-glib/html/telepathy-glib-dbus.html
docs/reference/telepathy-glib/html/telepathy-glib-debug-sender.html
docs/reference/telepathy-glib/html/telepathy-glib-errors.html
docs/reference/telepathy-glib/html/telepathy-glib-logger.html
docs/reference/telepathy-glib/html/telepathy-glib-proxy-subclass.html
docs/reference/telepathy-glib/html/telepathy-glib-proxy.html
docs/reference/telepathy-glib/html/telepathy-glib-version.html
docs/reference/telepathy-glib/html/telepathy-glib.devhelp2
docs/reference/telepathy-glib/telepathy-glib-docs.sgml
docs/reference/telepathy-glib/telepathy-glib-sections.txt
docs/reference/telepathy-glib/version.xml
examples/client/Makefile.in
examples/client/extended-client.c
telepathy-glib/Makefile.am
telepathy-glib/Makefile.in
telepathy-glib/TelepathyGLib-1.gir
telepathy-glib/account-channel-request.c
telepathy-glib/account-manager.c
telepathy-glib/account-request.c
telepathy-glib/account.c
telepathy-glib/base-client.c
telepathy-glib/base-connection-manager.c
telepathy-glib/base-connection.c
telepathy-glib/channel-dispatch-operation.c
telepathy-glib/channel-dispatcher.h
telepathy-glib/channel-group.c
telepathy-glib/cli-channel.c
telepathy-glib/cli-connection.c
telepathy-glib/cli-misc.c
telepathy-glib/connection-manager.c
telepathy-glib/core-dbus.c
telepathy-glib/core-svc-interface.h
telepathy-glib/dbus-daemon.c
telepathy-glib/dbus-daemon.h
telepathy-glib/dbus-internal.h
telepathy-glib/dbus.c
telepathy-glib/dbus.h
telepathy-glib/debug-client.c
telepathy-glib/debug-sender.c
telepathy-glib/errors.c
telepathy-glib/logger.c
telepathy-glib/message.c
telepathy-glib/protocol.c
telepathy-glib/proxy-internal.h
telepathy-glib/proxy-methods.c
telepathy-glib/proxy-subclass.h
telepathy-glib/proxy.c
telepathy-glib/proxy.h
telepathy-glib/reentrants.c
telepathy-glib/run.c
telepathy-glib/stream-tube-channel.c
telepathy-glib/svc-interface-skeleton-internal.h
telepathy-glib/svc-interface-skeleton.c
telepathy-glib/text-channel.c
telepathy-glib/tls-certificate.c
telepathy-glib/versions/core-1.0.abi
telepathy-glib/versions/dbus-1.0.abi
telepathy-glib/versions/main-1.0.abi
telepathy-logger/dbus-service.c
tests/dbus/account-manager.c
tests/dbus/call-cancellation.c
tests/dbus/channel-dispatch-operation.c
tests/dbus/channel-request.c
tests/dbus/connection-aliasing.c
tests/dbus/connection-balance.c
tests/dbus/connection-interests.c
tests/dbus/dbus.c
tests/dbus/disconnection.c
tests/dbus/example-no-protocols.c
tests/dbus/get-interface-after-invalidate.c
tests/dbus/group-mixin.c
tests/dbus/message-mixin.c
tests/dbus/simple-approver.c
tools/glib-ginterface-gen.py
ChangeLog | 337 ++
NEWS | 53 +-
configure | 33 +-
configure.ac | 8 +-
docs/reference/libtelepathy-logger/Makefile.am | 1 -
docs/reference/libtelepathy-logger/Makefile.in | 1 -
docs/reference/telepathy-farstream/Makefile.am | 1 -
docs/reference/telepathy-farstream/Makefile.in | 1 -
docs/reference/telepathy-glib/Makefile.am | 1 -
docs/reference/telepathy-glib/Makefile.in | 1 -
.../telepathy-glib/html/TpBaseCallChannel.html | 50 +-
.../telepathy-glib/html/TpBaseCallContent.html | 48 +-
.../telepathy-glib/html/TpBaseCallStream.html | 42 +-
.../telepathy-glib/html/TpBaseConnection.html | 30 +-
.../html/TpBaseConnectionManager.html | 25 +-
.../html/TpBaseMediaCallChannel.html | 10 +-
.../html/TpBaseMediaCallContent.html | 10 +-
.../telepathy-glib/html/TpBaseMediaCallStream.html | 56 +-
.../html/TpCallContentMediaDescription.html | 49 +-
.../telepathy-glib/html/TpCallStreamEndpoint.html | 42 +-
.../telepathy-glib/html/TpDebugClient.html | 62 +-
docs/reference/telepathy-glib/html/ch-dbus.html | 4 +
.../reference/telepathy-glib/html/ch-protocol.html | 4 +-
.../telepathy-glib/html/ch-service-base.html | 3 +
docs/reference/telepathy-glib/html/index.html | 9 +-
docs/reference/telepathy-glib/html/index.sgml | 151 +-
.../html/telepathy-glib-TpSvcInterface.html | 3 +
.../html/telepathy-glib-account-manager.html | 190 +-
...epathy-glib-add-dispatch-operation-context.html | 6 +-
.../telepathy-glib/html/telepathy-glib-asv.html | 38 +-
.../telepathy-glib-automatic-client-factory.html | 12 +-
.../html/telepathy-glib-base-client.html | 55 +-
.../html/telepathy-glib-base-protocol.html | 2 +-
.../html/telepathy-glib-channel-dispatcher.html | 41 +-
.../html/telepathy-glib-channel-filter.html | 725 +++
.../html/telepathy-glib-client-factory.html | 469 +-
.../html/telepathy-glib-connection-manager.html | 152 +-
.../html/telepathy-glib-dbus-properties-mixin.html | 2 +-
.../telepathy-glib/html/telepathy-glib-dbus.html | 490 +-
.../html/telepathy-glib-debug-sender.html | 2 +-
.../telepathy-glib/html/telepathy-glib-dtmf.html | 22 +-
.../telepathy-glib/html/telepathy-glib-errors.html | 2 +-
.../html/telepathy-glib-file-transfer-channel.html | 2 +-
.../html/telepathy-glib-gnio-util.html | 2 +-
.../telepathy-glib-handle-channel-context.html | 16 +-
.../html/telepathy-glib-interfaces.html | 20 -
.../telepathy-glib/html/telepathy-glib-logger.html | 14 +-
.../telepathy-glib-observe-channel-context.html | 18 +-
.../html/telepathy-glib-proxy-dbus-core.html | 3487 ++------------
.../html/telepathy-glib-proxy-subclass.html | 8 +-
.../telepathy-glib/html/telepathy-glib-proxy.html | 79 +-
.../html/telepathy-glib-simple-approver.html | 12 +-
.../html/telepathy-glib-simple-handler.html | 12 +-
.../html/telepathy-glib-simple-observer.html | 12 +-
.../telepathy-glib/html/telepathy-glib-util.html | 1117 +----
.../html/telepathy-glib-value-array.html | 252 +
.../html/telepathy-glib-version.html | 2 +-
.../telepathy-glib/html/telepathy-glib.devhelp2 | 143 +-
.../telepathy-glib/telepathy-glib-docs.sgml | 4 +-
.../telepathy-glib/telepathy-glib-sections.txt | 156 +-
docs/reference/telepathy-glib/telepathy-glib.types | 1 -
docs/reference/telepathy-glib/version.xml | 2 +-
examples/client/Makefile.am | 1 -
examples/client/Makefile.in | 11 -
examples/client/dbus-tubes/Makefile.am | 1 -
examples/client/dbus-tubes/Makefile.in | 7 +-
examples/client/extended-client.c | 13 +-
examples/client/inspect-cm.c | 16 +-
examples/client/list-managers.c | 15 +-
examples/client/stream-tubes/Makefile.am | 1 -
examples/client/stream-tubes/Makefile.in | 7 +-
examples/cm/call/Makefile.am | 1 -
examples/cm/call/Makefile.in | 2 -
examples/cm/call/call-stream.c | 4 +-
examples/cm/call/protocol.c | 1 +
examples/cm/channelspecific/Makefile.am | 1 -
examples/cm/channelspecific/Makefile.in | 2 -
examples/cm/channelspecific/protocol.c | 1 +
examples/cm/contactlist/Makefile.am | 1 -
examples/cm/contactlist/Makefile.in | 2 -
examples/cm/contactlist/protocol.c | 1 +
examples/cm/echo-message-parts/Makefile.am | 1 -
examples/cm/echo-message-parts/Makefile.in | 2 -
examples/cm/extended/Makefile.am | 1 -
examples/cm/extended/Makefile.in | 2 -
examples/cm/extended/protocol.c | 1 +
examples/cm/no-protocols/Makefile.am | 1 -
examples/cm/no-protocols/Makefile.in | 2 -
examples/extensions/Makefile.am | 1 -
examples/extensions/Makefile.in | 4 +-
telepathy-farstream/Makefile.am | 1 -
telepathy-farstream/Makefile.in | 2 -
telepathy-farstream/call-content.c | 2 +-
telepathy-farstream/call-stream.c | 2 +-
telepathy-farstream/examples/Makefile.am | 1 -
telepathy-farstream/examples/Makefile.in | 2 -
telepathy-glib/Makefile.am | 51 +-
telepathy-glib/Makefile.in | 212 +-
telepathy-glib/TelepathyGLib-1.gir | 4862 ++++++++++----------
telepathy-glib/TelepathyGLibDBus-1.gir | 13 +-
telepathy-glib/abi.am | 28 -
telepathy-glib/account-channel-request.c | 13 +-
telepathy-glib/account-manager.c | 166 +-
telepathy-glib/account-manager.h | 12 -
telepathy-glib/account-request.c | 3 +
telepathy-glib/account.c | 14 +-
telepathy-glib/{dbus.c => asv.c} | 622 +--
telepathy-glib/{dbus.h => asv.h} | 61 +-
telepathy-glib/automatic-client-factory-internal.h | 15 +-
telepathy-glib/automatic-client-factory.c | 22 +-
telepathy-glib/automatic-client-factory.h | 2 +-
telepathy-glib/base-call-channel.c | 2 +
telepathy-glib/base-call-content.c | 9 +-
telepathy-glib/base-call-stream.c | 9 +-
telepathy-glib/base-channel.c | 14 +-
telepathy-glib/base-client.c | 77 +-
telepathy-glib/base-client.h | 2 +-
telepathy-glib/base-connection-manager.c | 62 +-
telepathy-glib/base-connection-manager.h | 2 +-
telepathy-glib/base-connection.c | 75 +-
telepathy-glib/base-connection.h | 3 +-
telepathy-glib/base-contact-list.c | 2 +
telepathy-glib/base-media-call-content.c | 2 +
telepathy-glib/base-media-call-stream.c | 1 +
telepathy-glib/base-password-channel.c | 1 +
telepathy-glib/base-protocol.c | 5 +
telepathy-glib/base-room-config.c | 2 +
telepathy-glib/call-channel.c | 7 +-
telepathy-glib/call-content-media-description.c | 50 +-
telepathy-glib/call-content-media-description.h | 2 +-
telepathy-glib/call-content.c | 3 +-
telepathy-glib/call-stream-endpoint.c | 45 +-
telepathy-glib/call-stream-endpoint.h | 3 +-
telepathy-glib/call-stream.c | 1 +
telepathy-glib/capabilities.c | 2 +
telepathy-glib/channel-dispatch-operation.c | 15 +-
telepathy-glib/channel-dispatcher.c | 38 +-
telepathy-glib/channel-dispatcher.h | 3 -
telepathy-glib/channel-filter.c | 2 +
telepathy-glib/channel-group.c | 2 +
telepathy-glib/channel-request.c | 15 +-
telepathy-glib/channel.c | 23 +-
telepathy-glib/cli-channel.c | 5 +
telepathy-glib/cli-connection.c | 5 +
telepathy-glib/cli-misc.c | 6 +-
telepathy-glib/cli-misc.h | 1 -
telepathy-glib/{proxy-subclass.h => cli-proxy.h} | 27 +-
telepathy-glib/client-factory-internal.h | 38 +-
telepathy-glib/client-factory.c | 406 +-
telepathy-glib/client-factory.h | 30 +-
telepathy-glib/client.c | 16 -
telepathy-glib/cm-message.c | 1 +
telepathy-glib/codegen.am | 15 +-
telepathy-glib/connection-aliasing.c | 1 +
telepathy-glib/connection-avatars.c | 1 +
telepathy-glib/connection-contact-info.c | 2 +
telepathy-glib/connection-contact-list.c | 1 +
telepathy-glib/connection-manager.c | 85 +-
telepathy-glib/connection-manager.h | 6 +-
telepathy-glib/connection.c | 11 +-
telepathy-glib/contact-search.c | 2 +
telepathy-glib/contact.c | 2 +
telepathy-glib/core-dbus.c | 101 -
telepathy-glib/core-proxy.c | 2 +-
telepathy-glib/core-svc-interface.c | 106 -
telepathy-glib/dbus-daemon.c | 664 ---
telepathy-glib/dbus-daemon.h | 77 -
telepathy-glib/dbus-daemon.xml | 80 -
telepathy-glib/dbus-internal.h | 7 +-
telepathy-glib/dbus-properties-mixin-internal.h | 34 -
telepathy-glib/dbus-properties-mixin.c | 36 +-
telepathy-glib/dbus-properties-mixin.h | 6 -
telepathy-glib/dbus-tube-channel.c | 6 +-
telepathy-glib/dbus.c | 1595 ++-----
telepathy-glib/dbus.h | 95 +-
telepathy-glib/debug-client.c | 20 +-
telepathy-glib/debug-client.h | 6 -
telepathy-glib/debug-sender.c | 14 +-
telepathy-glib/errors.c | 2 +-
telepathy-glib/file-transfer-channel.c | 7 +-
telepathy-glib/{gnio-util.c => gnio-unix.c} | 292 +-
telepathy-glib/{gnio-util.h => gnio-unix.h} | 24 +-
telepathy-glib/gnio-util.c | 522 +--
telepathy-glib/gnio-util.h | 43 +-
telepathy-glib/group-mixin.c | 2 +
telepathy-glib/introspection.am | 6 +-
telepathy-glib/logger.c | 48 +-
telepathy-glib/message-mixin.c | 3 +
telepathy-glib/message.c | 2 +
telepathy-glib/observe-channel-context.c | 1 +
telepathy-glib/presence-mixin.c | 2 +
telepathy-glib/protocol-internal.h | 7 -
telepathy-glib/protocol.c | 30 +-
telepathy-glib/proxy-internal.h | 14 +-
telepathy-glib/proxy-methods.c | 6 +-
telepathy-glib/proxy-signals.c | 2 +-
telepathy-glib/proxy-subclass.h | 16 -
telepathy-glib/proxy.c | 184 +-
telepathy-glib/proxy.h | 6 +-
telepathy-glib/reentrants.c | 3 +-
telepathy-glib/reentrants.h | 1 -
telepathy-glib/room-info.c | 3 +
telepathy-glib/room-list.c | 1 +
telepathy-glib/run.c | 10 +-
telepathy-glib/signalled-message.c | 1 +
telepathy-glib/sliced-gvalue.c | 497 ++
telepathy-glib/sliced-gvalue.h | 79 +
telepathy-glib/stable-interfaces.xml | 1 -
telepathy-glib/stream-tube-channel.c | 7 +-
telepathy-glib/svc-interface-skeleton-internal.h | 2 +-
telepathy-glib/svc-interface-skeleton.c | 1 +
telepathy-glib/svc-interface.c | 217 +
.../{core-svc-interface.h => svc-interface.h} | 19 +-
.../telepathy-glib-1-dbus-uninstalled.pc.in | 2 +-
telepathy-glib/telepathy-glib-1-dbus.pc.in | 2 +-
telepathy-glib/telepathy-glib-1-uninstalled.pc.in | 2 +-
telepathy-glib/telepathy-glib-1.pc.in | 2 +-
telepathy-glib/telepathy-glib-dbus.h | 9 +-
telepathy-glib/telepathy-glib.h | 3 +-
telepathy-glib/text-channel.c | 5 +-
telepathy-glib/tls-certificate.c | 3 +-
telepathy-glib/util.c | 347 --
telepathy-glib/util.h | 57 -
telepathy-glib/{core-util.c => value-array.c} | 17 +-
telepathy-glib/value-array.h | 59 +
telepathy-glib/variant-util.c | 45 -
telepathy-glib/variant-util.h | 4 -
telepathy-glib/versions/core-1.0.abi | 24 -
telepathy-glib/versions/dbus-1.0.abi | 90 +-
telepathy-glib/versions/main-1.0.abi | 108 +-
telepathy-logger/Makefile.am | 2 -
telepathy-logger/Makefile.in | 4 -
telepathy-logger/call-channel-internal.h | 8 +-
telepathy-logger/call-channel.c | 14 +-
telepathy-logger/client-factory-internal.h | 2 +-
telepathy-logger/client-factory.c | 10 +-
telepathy-logger/conf.c | 2 +-
telepathy-logger/dbus-service.c | 12 +-
telepathy-logger/log-store-xml.c | 24 +-
telepathy-logger/observer.c | 3 +-
telepathy-logger/telepathy-logger.c | 18 +-
telepathy-logger/text-channel-internal.h | 8 +-
telepathy-logger/text-channel.c | 14 +-
tests/Makefile.am | 7 -
tests/Makefile.in | 25 +-
tests/capabilities.c | 2 +
tests/dbus/Makefile.am | 9 -
tests/dbus/Makefile.in | 85 -
tests/dbus/account-channel-request.c | 21 +-
tests/dbus/account-manager.c | 49 +-
tests/dbus/account-request.c | 19 +-
tests/dbus/account.c | 17 +-
tests/dbus/base-client.c | 36 +-
tests/dbus/call-cancellation.c | 54 +-
tests/dbus/call-channel.c | 17 +-
tests/dbus/channel-dispatch-operation.c | 41 +-
tests/dbus/channel-dispatcher.c | 10 +-
tests/dbus/channel-introspect.c | 5 +-
tests/dbus/channel-manager-request-properties.c | 5 +-
tests/dbus/channel-request.c | 44 +-
tests/dbus/channel.c | 4 +-
tests/dbus/cli-group.c | 2 +
tests/dbus/client.c | 13 +-
tests/dbus/cm.c | 43 +-
tests/dbus/connection-aliasing.c | 12 +-
tests/dbus/connection-balance.c | 13 +-
tests/dbus/connection-interests.c | 16 +-
tests/dbus/connection.c | 14 +-
tests/dbus/contact-list-client.c | 4 +-
tests/dbus/contact-lists.c | 6 +-
tests/dbus/contacts-mixin.c | 1 +
tests/dbus/contacts.c | 10 +-
tests/dbus/dbus-tube.c | 5 +-
tests/dbus/dbus.c | 28 -
tests/dbus/debug-client.c | 12 +-
tests/dbus/disconnection.c | 32 +-
tests/dbus/example-no-protocols.c | 17 +-
tests/dbus/file-transfer-channel.c | 5 +-
tests/dbus/get-interface-after-invalidate.c | 45 -
tests/dbus/group-mixin.c | 2 +
tests/dbus/handle-repo.c | 6 +-
tests/dbus/list-cm-no-cm.c | 9 +-
tests/dbus/long-connection-name.c | 4 +-
tests/dbus/message-mixin.c | 15 +-
tests/dbus/properties.c | 16 +-
tests/dbus/protocol-objects.c | 18 +-
tests/dbus/proxy-preparation.c | 5 +-
tests/dbus/room-list.c | 10 +-
tests/dbus/self-handle.c | 4 +-
tests/dbus/self-presence.c | 4 +-
tests/dbus/simple-approver.c | 26 +-
tests/dbus/simple-handler.c | 20 +-
tests/dbus/simple-observer.c | 20 +-
tests/dbus/stream-tube.c | 5 +-
tests/dbus/text-channel.c | 5 +-
tests/dbus/text-respawn.c | 1 +
tests/dbus/tls-certificate.c | 6 +-
tests/dbus/unsupported-interface.c | 4 +-
tests/gnio-util.c | 1 +
tests/intset.c | 1 +
tests/lib/Makefile.am | 2 -
tests/lib/Makefile.in | 8 +-
tests/lib/logger-test-helper.c | 8 +-
tests/lib/logger-test-helper.h | 4 +-
tests/lib/simple-channel-dispatcher.c | 6 +-
tests/lib/simple-channel-request.c | 10 +-
tests/lib/tls-certificate.c | 22 +-
tests/lib/util.c | 59 +-
tests/lib/util.h | 6 +-
tests/logger/Makefile.am | 1 -
tests/logger/Makefile.in | 2 -
tests/logger/dbus/test-log-manager.c | 12 +-
tests/logger/dbus/test-tpl-log-iter-pidgin.c | 12 +-
tests/logger/dbus/test-tpl-log-iter-xml.c | 8 +-
tests/logger/dbus/test-tpl-log-store-pidgin.c | 12 +-
tests/logger/dbus/test-tpl-log-store-sqlite.c | 4 +-
tests/logger/dbus/test-tpl-log-store-xml.c | 8 +-
tests/logger/dbus/test-tpl-log-walker.c | 12 +-
tests/util.c | 1 +
tools/glib-ginterface-gen.py | 4 +-
320 files changed, 8388 insertions(+), 14484 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-glib-1.git
More information about the Pkg-telepathy-commits
mailing list