[Pkg-telepathy-commits] [telepathy-glib] 03/05: Merge tag 'upstream/0.23.1' into debian-experimental
Simon McVittie
smcv at debian.org
Wed Mar 19 14:34:30 UTC 2014
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch debian-experimental
in repository telepathy-glib.
commit f7bb6a281063bff9a048c2e38a11f9f6db6f34cc
Merge: 7552189 ffeedb5
Author: Simon McVittie <smcv at debian.org>
Date: Tue Feb 4 13:50:44 2014 +0000
Merge tag 'upstream/0.23.1' into debian-experimental
Upstream version 0.23.1
Conflicts:
ChangeLog
NEWS
configure
configure.ac
docs/reference/html/annotation-glossary.html
docs/reference/html/index.html
docs/reference/html/index.sgml
docs/reference/html/telepathy-glib-version.html
docs/reference/version.xml
ChangeLog | 672 ++++++++
INSTALL | 4 +-
Makefile.am | 2 +-
Makefile.in | 16 +-
NEWS | 63 +-
README | 26 +-
compile => build-aux/compile | 0
build-aux/config.guess | 1558 +++++++++++++++++
build-aux/config.sub | 1791 ++++++++++++++++++++
build-aux/depcomp | 791 +++++++++
build-aux/install-sh | 527 ++++++
ltmain.sh => build-aux/ltmain.sh | 4 +-
missing => build-aux/missing | 4 +-
test-driver => build-aux/test-driver | 20 +-
config.h.in | 4 +-
configure | 77 +-
configure.ac | 23 +-
docs/reference/Makefile.am | 12 +-
docs/reference/Makefile.in | 12 +-
docs/reference/html/annotation-glossary.html | 40 +-
docs/reference/html/ch-client.html | 6 +
docs/reference/html/index.html | 10 +-
docs/reference/html/index.sgml | 84 +-
.../html/telepathy-glib-TpPresenceMixin.html | 280 ++-
.../html/telepathy-glib-account-manager.html | 4 +
.../html/telepathy-glib-account-request.html | 5 +-
docs/reference/html/telepathy-glib-account.html | 33 +
.../html/telepathy-glib-base-protocol.html | 6 +-
.../html/telepathy-glib-channel-dispatcher.html | 150 ++
.../html/telepathy-glib-connection-addressing.html | 4 +-
.../html/telepathy-glib-connection-manager.html | 30 +
.../html/telepathy-glib-connection-renaming.html | 306 ++++
.../html/telepathy-glib-connection-sidecars.html | 203 +++
.../html/telepathy-glib-contact-search.html | 4 +-
docs/reference/html/telepathy-glib-interfaces.html | 63 +
docs/reference/html/telepathy-glib-protocol.html | 521 ++++++
.../html/telepathy-glib-simple-client-factory.html | 6 +-
.../telepathy-glib-svc-channel-dispatcher.html | 161 +-
.../html/telepathy-glib-svc-connection.html | 356 +++-
docs/reference/html/telepathy-glib-util.html | 26 +-
docs/reference/html/telepathy-glib-version.html | 15 +-
docs/reference/html/telepathy-glib.devhelp2 | 64 +-
docs/reference/telepathy-glib-docs.sgml | 4 +-
docs/reference/telepathy-glib-sections.txt | 94 +
docs/reference/telepathy-glib.types | 4 +
docs/reference/version.xml | 2 +-
examples/client/Makefile.in | 19 +-
examples/client/approver.c | 1 -
examples/client/contact-list.c | 1 -
examples/client/dbus-tubes/Makefile.in | 19 +-
examples/client/dbus-tubes/accepter.c | 2 -
examples/client/dbus-tubes/offerer.c | 2 -
examples/client/extended-client.c | 14 +-
examples/client/inspect-channel.c | 1 -
examples/client/inspect-cm.c | 1 -
examples/client/inspect-connection.c | 1 -
examples/client/inspect-contact.c | 1 -
examples/client/list-connections.c | 1 -
examples/client/list-managers.c | 1 -
examples/client/media-observer.c | 1 -
examples/client/python/inspect-cm.py | 21 +-
examples/client/stream-tubes/Makefile.in | 19 +-
examples/client/stream-tubes/accepter.c | 2 -
examples/client/stream-tubes/offerer.c | 2 -
examples/client/text-handler.c | 1 -
examples/cm/call/Makefile.in | 19 +-
examples/cm/call/main.c | 4 -
examples/cm/channelspecific/Makefile.in | 19 +-
examples/cm/contactlist/Makefile.in | 19 +-
examples/cm/contactlist/conn.c | 14 +-
examples/cm/echo-message-parts/Makefile.in | 19 +-
examples/cm/echo-message-parts/protocol.c | 70 +-
examples/cm/extended/Makefile.in | 19 +-
examples/cm/extended/conn.c | 42 +-
examples/cm/no-protocols/Makefile.in | 19 +-
examples/extensions/Makefile.in | 48 +-
ltmain.sh | 4 +-
m4/libtool.m4 | 12 +-
missing | 4 +-
spec/Channel_Dispatcher_Interface_Messages1.xml | 175 ++
spec/Channel_Type_File_Transfer.xml | 29 +
spec/Connection_Interface_IRC_Command1.xml | 55 +
spec/Connection_Interface_Renaming.xml | 4 +-
spec/Connection_Interface_Sidecars1.xml | 110 ++
spec/Makefile.am | 3 +
spec/Makefile.in | 3 +
spec/all.xml | 6 +-
telepathy-glib/Makefile.in | 290 ++--
telepathy-glib/TelepathyGLib-0.12.gir | 574 ++++++-
telepathy-glib/abi.am | 2 +
telepathy-glib/account-manager.c | 3 +-
telepathy-glib/account-manager.h | 3 +-
telepathy-glib/account-request.c | 2 +-
telepathy-glib/account.c | 83 +-
telepathy-glib/account.h | 3 +
telepathy-glib/base-call-channel.c | 12 +-
telepathy-glib/base-call-content.c | 2 +-
telepathy-glib/base-call-stream.c | 6 +-
telepathy-glib/base-connection-manager.c | 2 +-
telepathy-glib/base-connection.c | 40 +-
telepathy-glib/base-contact-list.c | 2 +-
telepathy-glib/base-media-call-stream.c | 6 +-
telepathy-glib/base-protocol.c | 2 +-
telepathy-glib/call-content-media-description.c | 12 +-
telepathy-glib/call-stream-endpoint.c | 19 +-
telepathy-glib/capabilities.c | 15 +-
telepathy-glib/channel-dispatcher.xml | 1 +
telepathy-glib/connection-contact-info.c | 2 +-
telepathy-glib/connection-manager.c | 70 +-
telepathy-glib/connection-manager.h | 3 +
telepathy-glib/connection.xml | 2 +
telepathy-glib/contact.c | 181 +-
telepathy-glib/defs.h | 15 +
telepathy-glib/errors.c | 1 -
telepathy-glib/extra-gtkdoc.h | 30 +
telepathy-glib/file-transfer-channel.c | 37 +-
telepathy-glib/gnio-util.c | 2 +
telepathy-glib/group-mixin.c | 2 +-
telepathy-glib/message-mixin.c | 2 +-
telepathy-glib/presence-mixin.c | 317 +++-
telepathy-glib/presence-mixin.h | 35 +-
telepathy-glib/protocol.c | 655 ++++++-
telepathy-glib/protocol.h | 63 +
telepathy-glib/proxy-methods.c | 5 +-
telepathy-glib/proxy-signals.c | 3 +-
telepathy-glib/room-info.c | 22 +-
telepathy-glib/run.c | 2 -
telepathy-glib/simple-client-factory.c | 2 -
telepathy-glib/telepathy-glib.h | 1 +
telepathy-glib/text-mixin.c | 2 +-
telepathy-glib/util.c | 26 +-
telepathy-glib/util.h | 16 +
telepathy-glib/versions/0.23.0.abi | 19 +
telepathy-glib/versions/0.23.1.abi | 24 +
tests/Makefile.in | 39 +-
tests/asv.c | 2 -
tests/capabilities.c | 5 +-
tests/contact-search-result.c | 1 -
tests/dbus/Makefile.am | 37 +-
tests/dbus/Makefile.in | 157 +-
tests/dbus/account-channel-request.c | 2 +-
tests/dbus/account-manager.c | 13 +-
tests/dbus/account-request.c | 3 +-
tests/dbus/account.c | 35 +-
tests/dbus/base-client.c | 2 +-
tests/dbus/call-cancellation.c | 1 -
tests/dbus/call-channel.c | 3 +-
tests/dbus/channel-dispatch-operation.c | 3 +-
tests/dbus/channel-dispatcher.c | 3 +-
tests/dbus/channel-introspect.c | 1 -
tests/dbus/channel-manager-request-properties.c | 3 +-
tests/dbus/channel-request.c | 3 +-
tests/dbus/channel.c | 2 +-
tests/dbus/cli-group.c | 1 -
tests/dbus/client-channel-factory.c | 2 +-
tests/dbus/client.c | 3 +-
tests/dbus/cm-message.c | 3 +-
tests/dbus/cm.c | 3 +-
tests/dbus/connection-aliasing.c | 5 +-
tests/dbus/connection-balance.c | 5 +-
tests/dbus/connection-bug-18845.c | 1 -
tests/dbus/connection-error.c | 4 +-
tests/dbus/connection-getinterfaces-failure.c | 1 -
tests/dbus/connection-handles.c | 1 -
tests/dbus/connection-inject-bug16307.c | 1 -
tests/dbus/connection-interests.c | 3 +-
tests/dbus/connection.c | 3 +-
tests/dbus/contact-list-client.c | 2 +-
tests/dbus/contact-lists.c | 4 +-
tests/dbus/contacts-bug-19101.c | 1 -
tests/dbus/contacts-mixin.c | 1 -
tests/dbus/contacts-slow-path.c | 2 +-
tests/dbus/contacts.c | 4 +-
.../services/spurious.service | 0
tests/dbus/dbus-installed/session.conf.in | 29 -
tests/dbus/dbus-tube.c | 2 +-
.../dbus-uninstalled/services/spurious.service | 3 -
tests/dbus/dbus-uninstalled/session.conf.in | 29 -
tests/dbus/dbus.c | 2 +-
tests/dbus/debug-client.c | 2 +-
tests/dbus/disconnection.c | 1 -
tests/dbus/error-enum.c | 4 +-
tests/dbus/example-no-protocols.c | 1 -
tests/dbus/file-transfer-channel.c | 3 +-
tests/dbus/finalized-in-invalidated-handler.c | 1 -
tests/dbus/get-interface-after-invalidate.c | 2 +-
tests/dbus/group-mixin.c | 1 -
tests/dbus/handle-repo.c | 1 -
tests/dbus/handle-set.c | 1 -
tests/dbus/invalidated-while-invoking-signals.c | 1 -
tests/dbus/long-connection-name.c | 4 +-
tests/dbus/message-mixin.c | 1 -
tests/dbus/params-cm.c | 3 +-
tests/dbus/properties.c | 2 +-
tests/dbus/protocol-objects.c | 155 +-
tests/dbus/proxy-preparation.c | 2 +-
tests/dbus/room-list.c | 2 +-
tests/dbus/run-test.sh.in | 13 +-
tests/dbus/self-handle.c | 2 +-
tests/dbus/self-presence.c | 1 -
tests/dbus/simple-approver.c | 2 +-
tests/dbus/simple-handler.c | 2 +-
tests/dbus/simple-observer.c | 2 +-
tests/dbus/stream-tube.c | 2 +-
tests/dbus/text-channel.c | 2 +-
tests/dbus/text-mixin.c | 1 -
tests/dbus/text-respawn.c | 1 -
tests/dbus/tls-certificate.c | 2 +-
tests/dbus/unsupported-interface.c | 3 +-
tests/debug-domain.c | 2 -
tests/dtmf-player.c | 2 -
tests/enums.c | 4 -
tests/gnio-util.c | 9 +-
tests/intset.c | 2 -
tests/lib/Makefile.am | 2 +-
tests/lib/Makefile.in | 21 +-
tests/lib/broken-client-types-conn.c | 8 +-
tests/lib/bug-19101-conn.c | 3 +-
tests/lib/bug16307-conn.c | 8 +-
tests/lib/bug16307-conn.h | 2 +-
tests/lib/contact-list-manager.h | 2 +-
tests/lib/contacts-conn.c | 26 +-
tests/lib/contacts-conn.h | 4 +-
tests/lib/dbus-tube-chan.c | 3 -
tests/lib/dbus-tube-chan.h | 3 +-
tests/lib/echo-chan.c | 3 +-
tests/lib/echo-chan.h | 4 +-
tests/lib/echo-cm.h | 2 +-
tests/lib/echo-conn.c | 1 -
tests/lib/echo-conn.h | 2 +-
tests/lib/file-transfer-chan.c | 3 -
tests/lib/file-transfer-chan.h | 3 +-
tests/lib/my-conn-proxy.c | 2 +-
tests/lib/myassert.h | 2 +-
tests/lib/params-cm.c | 3 +-
tests/lib/params-cm.h | 2 +-
tests/lib/room-list-chan.c | 4 +-
tests/lib/room-list-chan.h | 2 +-
tests/lib/simple-account-manager.c | 8 +-
tests/lib/simple-account-manager.h | 2 +-
tests/lib/simple-account.c | 69 +-
tests/lib/simple-account.h | 6 +-
tests/lib/simple-channel-dispatch-operation.c | 11 +-
tests/lib/simple-channel-dispatch-operation.h | 3 +-
tests/lib/simple-channel-dispatcher.c | 9 +-
tests/lib/simple-channel-dispatcher.h | 2 +-
tests/lib/simple-channel-manager.c | 2 +-
tests/lib/simple-channel-manager.h | 2 +-
tests/lib/simple-channel-request.c | 8 +-
tests/lib/simple-channel-request.h | 3 +-
tests/lib/simple-client.c | 8 +-
tests/lib/simple-client.h | 2 +-
tests/lib/simple-conn.c | 9 +-
tests/lib/simple-conn.h | 2 +-
tests/lib/simple-manager.c | 3 +-
tests/lib/simple-manager.h | 2 +-
tests/lib/stream-tube-chan.c | 3 -
tests/lib/stream-tube-chan.h | 3 +-
tests/lib/textchan-group.c | 9 +-
tests/lib/textchan-group.h | 5 +-
tests/lib/textchan-null.c | 9 +-
tests/lib/textchan-null.h | 4 +-
tests/lib/tls-certificate.c | 2 +-
tests/lib/tls-certificate.h | 2 +-
tests/lib/util.c | 63 +-
tests/lib/util.h | 3 +-
tests/signal-connect-object.c | 1 -
tests/tools/Makefile.in | 6 +-
tests/util-cxx.cpp | 2 -
tests/util.c | 6 +-
tools/Makefile.am | 2 -
tools/Makefile.in | 2 -
tools/glib-client-gen.py | 78 +-
tools/glib-errors-check-gen.py | 1 -
tools/libglibcodegen.py | 23 +
tools/telepathy.am | 2 +-
tools/with-session-bus.sh | 106 --
277 files changed, 11310 insertions(+), 1469 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-glib.git
More information about the Pkg-telepathy-commits
mailing list