[Pkg-telepathy-commits] [telepathy-gabble] 28/33: Merge branch 'upstream-experimental' into upstream

Simon McVittie smcv at alioth.debian.org
Fri Aug 9 16:30:12 UTC 2013


This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian
in repository telepathy-gabble.

commit 7379140948d64fdc8533c5cbf579e82aa3cf07eb
Merge: e14d103 f0bf048
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Aug 9 16:56:23 2013 +0100

    Merge branch 'upstream-experimental' into upstream
    
    Conflicts:
    	ChangeLog
    	Makefile.in
    	NEWS
    	aclocal.m4
    	config.h.in
    	configure
    	configure.ac
    	data/Makefile.in
    	docs/Makefile.in
    	extensions/Makefile.in
    	gabble/Makefile.in
    	lib/Makefile.in
    	lib/ext/Makefile.in
    	lib/ext/wocky/docs/reference/html/WockyNodeTree.html
    	lib/ext/wocky/docs/reference/html/annotation-glossary.html
    	lib/ext/wocky/docs/reference/html/api-index-full.html
    	lib/ext/wocky/docs/reference/html/ch01.html
    	lib/ext/wocky/docs/reference/html/index.html
    	lib/ext/wocky/docs/reference/html/index.sgml
    	lib/ext/wocky/docs/reference/html/object-tree.html
    	lib/ext/wocky/docs/reference/html/wocky-Wocky-OpenSSL-TLS.html
    	lib/ext/wocky/docs/reference/html/wocky-WockyMuc.html
    	lib/ext/wocky/docs/reference/html/wocky-WockyNode.html
    	lib/ext/wocky/docs/reference/html/wocky-WockyPorter.html
    	lib/ext/wocky/docs/reference/html/wocky-WockyStanza.html
    	lib/ext/wocky/docs/reference/html/wocky-wocky-auth-registry-enumtypes.html
    	lib/ext/wocky/docs/reference/html/wocky-wocky-connector-enumtypes.html
    	lib/ext/wocky/docs/reference/html/wocky-wocky-data-form-enumtypes.html
    	lib/ext/wocky/docs/reference/html/wocky-wocky-enumtypes.html
    	lib/ext/wocky/docs/reference/html/wocky-wocky-pubsub-node-enumtypes.html
    	lib/ext/wocky/docs/reference/html/wocky-wocky-pubsub-service-enumtypes.html
    	lib/ext/wocky/docs/reference/html/wocky-wocky-tls-enumtypes.html
    	lib/ext/wocky/docs/reference/html/wocky-wocky-utils.html
    	lib/ext/wocky/docs/reference/html/wocky-wocky-xmpp-error-enumtypes.html
    	lib/ext/wocky/docs/reference/html/wocky-wocky-xmpp-reader-enumtypes.html
    	lib/ext/wocky/docs/reference/html/wocky.devhelp2
    	lib/ext/wocky/wocky/wocky-jingle-info.c
    	lib/gibber/Makefile.in
    	m4/Makefile.in
    	plugins/Makefile.in
    	plugins/console.c
    	src/Makefile.in
    	src/base-call-channel.h
    	src/bytestream-factory.c
    	src/call-channel.c
    	src/call-content.h
    	src/call-member.h
    	src/call-stream.h
    	src/conn-presence.c
    	src/connection.c
    	src/im-channel.c
    	src/im-channel.h
    	src/media-channel-internal.h
    	src/media-channel.c
    	src/media-stream.h
    	src/muc-channel.c
    	src/muc-factory.c
    	src/private-tubes-factory.c
    	tests/Makefile.in
    	tests/suppressions/Makefile.in
    	tests/twisted/Makefile.in
    	tests/twisted/muc/chat-states.py
    	tools/Makefile.in

 ChangeLog                                          | 2436 +++++++++++++++++++-
 INSTALL                                            |    8 +-
 Makefile.in                                        |  164 +-
 NEWS                                               |  136 +-
 aclocal.m4                                         |  425 ++--
 config.guess                                       |  178 +-
 config.h.in                                        |   12 +
 config.sub                                         |   86 +-
 configure                                          |  263 ++-
 configure.ac                                       |   11 +-
 data/Makefile.in                                   |   17 +-
 depcomp                                            |   89 +-
 docs/Makefile.in                                   |   21 +-
 extensions/Makefile.am                             |   48 +-
 extensions/Makefile.in                             |  144 +-
 gabble/Makefile.in                                 |   31 +-
 gabble/caps-channel-manager.h                      |    4 +-
 gabble/plugin-connection.h                         |    3 +-
 gabble/plugin.h                                    |    3 +-
 install-sh                                         |   14 +-
 lib/Makefile.in                                    |  109 +-
 lib/ext/Makefile.in                                |  111 +-
 lib/ext/wocky/Makefile.in                          |    2 +
 lib/ext/wocky/config.h.in                          |   10 +-
 lib/ext/wocky/configure                            |  213 +-
 lib/ext/wocky/configure.ac                         |   59 +-
 lib/ext/wocky/docs/Makefile.in                     |    2 +
 lib/ext/wocky/docs/reference/Makefile.in           |    2 +
 .../docs/reference/html/WockyAuthRegistry.html     |   16 +-
 .../wocky/docs/reference/html/WockyCapsCache.html  |    4 +-
 .../wocky/docs/reference/html/WockyContact.html    |    4 +-
 lib/ext/wocky/docs/reference/html/WockyMuc.html    | 1325 +++++++++++
 .../wocky/docs/reference/html/WockyNodeTree.html   |    2 +-
 .../wocky/docs/reference/html/WockyPubsubNode.html |    8 +-
 .../docs/reference/html/annotation-glossary.html   |    2 +
 .../wocky/docs/reference/html/api-index-full.html  | 1233 +++++++++-
 lib/ext/wocky/docs/reference/html/ch01.html        |   35 +-
 lib/ext/wocky/docs/reference/html/index.html       |   32 +-
 lib/ext/wocky/docs/reference/html/index.sgml       |  285 +--
 lib/ext/wocky/docs/reference/html/object-tree.html |   24 +-
 .../reference/html/wocky-Wocky-OpenSSL-TLS.html    |   12 +-
 .../reference/html/wocky-WockyAuthHandler.html     |    4 +-
 .../docs/reference/html/wocky-WockyCapsHash.html   |    4 +-
 .../docs/reference/html/wocky-WockyConnector.html  |    2 +-
 .../docs/reference/html/wocky-WockyDataForm.html   |   13 +-
 .../docs/reference/html/wocky-WockyMetaPorter.html |    4 +-
 .../wocky/docs/reference/html/wocky-WockyMuc.html  |  752 ------
 .../wocky/docs/reference/html/wocky-WockyNode.html |   45 +-
 .../docs/reference/html/wocky-WockyPorter.html     |   18 +-
 .../reference/html/wocky-WockyPubsubService.html   |    4 +-
 .../docs/reference/html/wocky-WockyStanza.html     |   77 +-
 .../reference/html/wocky-WockyTLSConnector.html    |    4 +-
 .../docs/reference/html/wocky-WockyTLSHandler.html |  129 +-
 .../reference/html/wocky-WockyXmppConnection.html  |    6 +-
 .../docs/reference/html/wocky-WockyXmppReader.html |   31 +-
 .../docs/reference/html/wocky-WockyXmppWriter.html |    2 +-
 .../html/wocky-wocky-auth-registry-enumtypes.html  |   53 -
 .../html/wocky-wocky-connector-enumtypes.html      |   53 -
 .../html/wocky-wocky-data-form-enumtypes.html      |   53 -
 .../docs/reference/html/wocky-wocky-debug.html     |    4 +-
 ...c-enumtypes.html => wocky-wocky-enumtypes.html} |   26 +-
 .../reference/html/wocky-wocky-namespaces.html     |  127 +-
 .../reference/html/wocky-wocky-pubsub-helpers.html |   11 +-
 .../html/wocky-wocky-pubsub-node-enumtypes.html    |   53 -
 .../html/wocky-wocky-pubsub-node-protected.html    |    8 +-
 .../html/wocky-wocky-pubsub-service-enumtypes.html |   53 -
 .../reference/html/wocky-wocky-tls-enumtypes.html  |   53 -
 .../docs/reference/html/wocky-wocky-utils.html     |   36 +-
 .../html/wocky-wocky-xmpp-error-enumtypes.html     |   53 -
 .../reference/html/wocky-wocky-xmpp-error.html     |   31 +-
 .../html/wocky-wocky-xmpp-reader-enumtypes.html    |   53 -
 lib/ext/wocky/docs/reference/html/wocky-wocky.html |    4 +-
 lib/ext/wocky/docs/reference/html/wocky.devhelp2   |  228 +-
 lib/ext/wocky/docs/reference/wocky-docs.sgml       |   21 +-
 lib/ext/wocky/examples/Makefile.am                 |   19 +-
 lib/ext/wocky/examples/Makefile.in                 |   69 +-
 lib/ext/wocky/examples/dump-certificates.c         |  175 ++
 lib/ext/wocky/examples/receive-messages.c          |   34 +-
 lib/ext/wocky/examples/send-message.c              |   29 +-
 lib/ext/wocky/m4/Makefile.in                       |    2 +
 lib/ext/wocky/tests/Makefile.am                    |  274 +--
 lib/ext/wocky/tests/Makefile.in                    |  281 +--
 .../tests/certs/{ss-cert.cfg => badwild-cert.cfg}  |   18 +-
 lib/ext/wocky/tests/certs/badwild-cert.pem         |   26 +
 lib/ext/wocky/tests/certs/badwild-key.pem          |  145 ++
 .../tests/certs/{ss-cert.cfg => ca-0-crl.cfg}      |   10 +-
 lib/ext/wocky/tests/certs/ca-0-crl.pem             |   13 +
 lib/ext/wocky/tests/certs/cas/8a76ade9.0           |   23 +
 lib/ext/wocky/tests/certs/cas/ae5bb84e.0           |   23 +
 lib/ext/wocky/tests/certs/cas/e7df1717.0           |   23 +
 lib/ext/wocky/tests/certs/ss-cert.cfg              |    2 +-
 lib/ext/wocky/tests/certs/ss-cert.pem              |   42 +-
 .../tests/certs/{ss-cert.cfg => wild-cert.cfg}     |   18 +-
 lib/ext/wocky/tests/certs/wild-cert.pem            |   26 +
 lib/ext/wocky/tests/certs/wild-key.pem             |  145 ++
 lib/ext/wocky/tests/wocky-caps-hash-test.c         |  173 ++
 lib/ext/wocky/tests/wocky-connector-test.c         |  210 +-
 lib/ext/wocky/tests/wocky-dummy-xmpp-server.c      |    4 -
 lib/ext/wocky/tests/wocky-http-proxy-test.c        |    4 -
 lib/ext/wocky/tests/wocky-node-tree-test.c         |    5 +-
 lib/ext/wocky/tests/wocky-porter-test.c            |    1 -
 lib/ext/wocky/tests/wocky-sasl-utils-test.c        |    4 -
 lib/ext/wocky/tests/wocky-stanza-test.c            |   70 +
 lib/ext/wocky/tests/wocky-test-connector-server.c  |    2 +
 lib/ext/wocky/tests/wocky-test-connector-server.h  |    2 +
 lib/ext/wocky/tests/wocky-test-helper.c            |    5 +-
 lib/ext/wocky/tests/wocky-xmpp-node-test.c         |   30 +
 lib/ext/wocky/tests/wocky-xmpp-reader-test.c       |   69 +
 lib/ext/wocky/tools/Makefile.in                    |    2 +
 lib/ext/wocky/wocky/Makefile.am                    |   93 +-
 lib/ext/wocky/wocky/Makefile.in                    |  269 ++-
 lib/ext/wocky/wocky/wocky-auth-registry.c          |   21 +-
 lib/ext/wocky/wocky/wocky-auth-registry.h          |    8 +-
 lib/ext/wocky/wocky/wocky-c2s-porter.c             |   66 +-
 lib/ext/wocky/wocky/wocky-connector.c              |  138 +-
 lib/ext/wocky/wocky/wocky-connector.h              |    2 +-
 lib/ext/wocky/wocky/wocky-data-form.h              |   10 +-
 lib/ext/wocky/wocky/wocky-debug-internal.h         |   14 +
 lib/ext/wocky/wocky/wocky-debug.c                  |   30 +-
 lib/ext/wocky/wocky/wocky-debug.h                  |    1 +
 .../ext/wocky/wocky/wocky-google-relay.c           |   40 +-
 .../ext/wocky/wocky/wocky-google-relay.h           |   23 +-
 lib/ext/wocky/wocky/wocky-jabber-auth.c            |    9 +-
 .../ext/wocky/wocky/wocky-jingle-content.c         |  596 ++---
 lib/ext/wocky/wocky/wocky-jingle-content.h         |  168 ++
 .../ext/wocky/wocky/wocky-jingle-factory.c         |  245 +-
 lib/ext/wocky/wocky/wocky-jingle-factory.h         |   93 +
 .../ext/wocky/wocky/wocky-jingle-info-internal.h   |   24 +-
 .../ext/wocky/wocky/wocky-jingle-info.c            |  371 ++-
 lib/ext/wocky/wocky/wocky-jingle-info.h            |  124 +
 .../ext/wocky/wocky/wocky-jingle-media-rtp.c       |  577 +++--
 lib/ext/wocky/wocky/wocky-jingle-media-rtp.h       |  129 ++
 .../ext/wocky/wocky/wocky-jingle-session.c         | 1195 ++++++----
 lib/ext/wocky/wocky/wocky-jingle-session.h         |  140 ++
 .../wocky/wocky/wocky-jingle-transport-google.c    |  200 +-
 .../wocky/wocky/wocky-jingle-transport-google.h    |   73 +
 .../wocky/wocky/wocky-jingle-transport-iceudp.c    |  183 +-
 .../wocky/wocky/wocky-jingle-transport-iceudp.h    |   69 +
 .../ext/wocky/wocky/wocky-jingle-transport-iface.c |  123 +-
 lib/ext/wocky/wocky/wocky-jingle-transport-iface.h |  111 +
 .../wocky/wocky/wocky-jingle-transport-rawudp.c    |  145 +-
 .../wocky/wocky/wocky-jingle-transport-rawudp.h    |   69 +
 lib/ext/wocky/wocky/wocky-jingle-types.h           |  157 ++
 lib/ext/wocky/wocky/wocky-meta-porter.c            |   26 +-
 lib/ext/wocky/wocky/wocky-muc.c                    |  187 +-
 lib/ext/wocky/wocky/wocky-muc.h                    |   27 +-
 lib/ext/wocky/wocky/wocky-namespaces.h             |   52 +
 lib/ext/wocky/wocky/wocky-node.c                   |   53 +-
 lib/ext/wocky/wocky/wocky-node.h                   |    8 +-
 lib/ext/wocky/wocky/wocky-openssl.c                |  232 +-
 lib/ext/wocky/wocky/wocky-porter.c                 |   15 +-
 lib/ext/wocky/wocky/wocky-pubsub-helpers.c         |    3 +-
 lib/ext/wocky/wocky/wocky-pubsub-node-protected.h  |    2 +-
 lib/ext/wocky/wocky/wocky-pubsub-node.c            |    6 +-
 lib/ext/wocky/wocky/wocky-pubsub-node.h            |    4 +-
 lib/ext/wocky/wocky/wocky-pubsub-service.h         |    2 +-
 lib/ext/wocky/wocky/wocky-sasl-auth.c              |    9 +-
 lib/ext/wocky/wocky/wocky-sasl-scram.c             |    2 +-
 lib/ext/wocky/wocky/wocky-stanza.c                 |   70 +-
 lib/ext/wocky/wocky/wocky-stanza.h                 |    2 +
 lib/ext/wocky/wocky/wocky-tls-connector.c          |   17 +-
 lib/ext/wocky/wocky/wocky-tls-handler.c            |  107 +-
 lib/ext/wocky/wocky/wocky-tls-handler.h            |    4 +
 lib/ext/wocky/wocky/wocky-tls.c                    |  163 +-
 lib/ext/wocky/wocky/wocky-tls.h                    |    3 +-
 lib/ext/wocky/wocky/wocky-uninstalled.pc.in        |    3 +-
 lib/ext/wocky/wocky/wocky-utils.c                  |   34 +-
 lib/ext/wocky/wocky/wocky-utils.h                  |    2 +-
 lib/ext/wocky/wocky/wocky-xmpp-connection.c        |    2 +-
 lib/ext/wocky/wocky/wocky-xmpp-error.c             |   22 +-
 lib/ext/wocky/wocky/wocky-xmpp-error.h             |   22 +-
 lib/ext/wocky/wocky/wocky-xmpp-reader.c            |   63 +-
 lib/ext/wocky/wocky/wocky-xmpp-reader.h            |    8 +-
 lib/ext/wocky/wocky/wocky-xmpp-writer.c            |    2 +-
 lib/ext/wocky/wocky/wocky.h                        |   11 +
 lib/ext/wocky/wocky/wocky.pc.in                    |   11 +
 lib/gibber/Makefile.in                             |   65 +-
 m4/Makefile.in                                     |   17 +-
 missing                                            |   99 +-
 plugins/Makefile.in                                |   94 +-
 plugins/console.c                                  |   31 +-
 plugins/console.h                                  |    2 +-
 plugins/gateways.c                                 |   12 +-
 plugins/test.c                                     |    5 +-
 src/Makefile.am                                    |   26 -
 src/Makefile.in                                    |  233 +-
 src/addressing-util.c                              |   34 +-
 src/addressing-util.h                              |    2 +-
 src/auth-manager.c                                 |  234 +-
 src/auth-manager.h                                 |    4 +-
 src/base-call-channel.c                            |   17 +-
 src/base-call-channel.h                            |    9 +-
 src/base64.c                                       |  196 --
 src/bytestream-factory.c                           |  100 +-
 src/bytestream-factory.h                           |    8 +-
 src/bytestream-ibb.c                               |   18 +-
 src/bytestream-ibb.h                               |    2 +-
 src/bytestream-muc.c                               |   18 +-
 src/bytestream-muc.h                               |    2 +-
 src/bytestream-multiple.c                          |   11 +-
 src/bytestream-socks5.c                            |  187 +-
 src/bytestream-socks5.h                            |    2 +-
 src/call-channel.c                                 |   97 +-
 src/call-content.c                                 |   47 +-
 src/call-content.h                                 |    6 +-
 src/call-member-content.c                          |   51 +-
 src/call-member-content.h                          |   13 +-
 src/call-member.c                                  |   70 +-
 src/call-member.h                                  |   14 +-
 src/call-muc-channel.c                             |   42 +-
 src/call-muc-channel.h                             |    4 +-
 src/call-stream.c                                  |  103 +-
 src/call-stream.h                                  |    7 +-
 src/capabilities.c                                 |   46 +-
 src/caps-channel-manager.c                         |    4 +-
 src/caps-hash.c                                    |    1 -
 src/conn-addressing.c                              |    6 +-
 src/conn-aliasing.c                                |   38 +-
 src/conn-avatars.c                                 |   64 +-
 src/conn-client-types.c                            |    3 +-
 src/conn-contact-info.c                            |   25 +-
 src/conn-location.c                                |   21 +-
 src/conn-mail-notif.c                              |   28 +-
 src/conn-olpc.c                                    |  168 +-
 src/conn-presence.c                                |  236 +-
 src/conn-sidecars.c                                |   22 +-
 src/connection-manager.c                           |    8 +-
 src/connection-manager.h                           |    2 +-
 src/connection.c                                   |  246 +-
 src/connection.h                                   |   10 +-
 src/debug.c                                        |    4 +-
 src/disco.c                                        |    2 +-
 src/error.c                                        |   16 +-
 src/ft-channel.c                                   |  113 +-
 src/ft-channel.h                                   |    2 +-
 src/ft-manager.c                                   |   47 +-
 src/gabble.c                                       |   12 +-
 src/gtalk-file-collection.c                        |  172 +-
 src/gtalk-file-collection.h                        |    6 +-
 src/im-channel.c                                   |  284 +--
 src/im-channel.h                                   |    9 +-
 src/im-factory.c                                   |   88 +-
 src/jingle-content.h                               |  163 --
 src/jingle-factory.h                               |   90 -
 src/jingle-info.h                                  |  116 -
 src/jingle-media-rtp.h                             |  124 -
 src/jingle-mint.c                                  |   54 +-
 src/jingle-mint.h                                  |    9 +-
 src/jingle-session.h                               |  139 --
 src/jingle-share.c                                 |   52 +-
 src/jingle-share.h                                 |   11 +-
 src/jingle-tp-util.c                               |   26 +-
 src/jingle-tp-util.h                               |    6 +-
 src/jingle-transport-google.h                      |   68 -
 src/jingle-transport-iceudp.h                      |   64 -
 src/jingle-transport-iface.h                       |  109 -
 src/jingle-transport-rawudp.h                      |   64 -
 src/jingle-types.h                                 |  126 -
 src/legacy-caps.c                                  |    2 +-
 src/media-channel-hold.c                           |   19 +-
 src/media-channel-internal.h                       |    9 +-
 src/media-channel.c                                |  354 ++-
 src/media-channel.h                                |    3 +-
 src/media-factory.c                                |   37 +-
 src/media-stream.c                                 |  212 +-
 src/media-stream.h                                 |   12 +-
 src/message-util.c                                 |   23 +-
 src/message-util.h                                 |    2 +-
 src/muc-channel.c                                  |  917 +++++---
 src/muc-channel.h                                  |   32 +-
 src/muc-factory.c                                  |  587 ++---
 src/muc-factory.h                                  |    5 +-
 src/muc-tube-dbus.c                                |   20 +-
 src/muc-tube-stream.c                              |   20 +-
 src/namespaces.h                                   |    5 +
 src/olpc-activity.c                                |   31 +-
 src/olpc-activity.h                                |    3 +-
 src/plugin-connection.c                            |    2 +-
 src/plugin-loader.c                                |    5 +-
 src/plugin-loader.h                                |    3 +-
 src/plugin.c                                       |   10 +-
 src/presence-cache.c                               |  167 +-
 src/presence-cache.h                               |    2 +-
 src/presence.c                                     |    2 +-
 src/private-tubes-factory.c                        |  882 ++++---
 src/private-tubes-factory.h                        |   10 +-
 src/protocol.c                                     |   25 +-
 src/protocol.h                                     |    2 +-
 src/request-pipeline.c                             |    4 +-
 src/room-config.c                                  |    1 +
 src/room-config.h                                  |    2 +-
 src/roomlist-channel.c                             |   17 +-
 src/roomlist-channel.h                             |    2 +-
 src/roomlist-manager.c                             |   11 +-
 src/roster.c                                       |   83 +-
 src/roster.h                                       |    2 +-
 src/search-channel.c                               |   48 +-
 src/search-channel.h                               |    2 +-
 src/search-manager.c                               |   18 +-
 src/server-sasl-channel.c                          |  253 +-
 src/server-sasl-channel.h                          |    5 +-
 src/server-tls-channel.c                           |   11 +-
 src/server-tls-channel.h                           |    2 +-
 src/server-tls-manager.c                           |    5 +-
 src/server-tls-manager.h                           |    3 +-
 src/tls-certificate.c                              |    8 +-
 src/tls-certificate.h                              |    2 +-
 src/tube-dbus.c                                    |  117 +-
 src/tube-dbus.h                                    |    8 +-
 src/tube-iface.c                                   |    9 +-
 src/tube-iface.h                                   |    2 +-
 src/tube-stream.c                                  |  106 +-
 src/tube-stream.h                                  |    7 +-
 src/types.h                                        |    2 +-
 src/util.c                                         |   74 +-
 src/util.h                                         |   12 +-
 src/vcard-manager.c                                |  619 +++--
 tests/Makefile.am                                  |    2 -
 tests/Makefile.in                                  |  170 +-
 tests/README                                       |    5 +
 tests/suppressions/Makefile.in                     |   17 +-
 tests/test-base64.c                                |  106 -
 tests/test-handles.c                               |    8 +-
 tests/tp-error-from-wocky.c                        |    2 +-
 tests/twisted/Makefile.am                          |    9 +-
 tests/twisted/Makefile.in                          |  106 +-
 tests/twisted/caps/advertise-contact-caps.py       |   23 +-
 tests/twisted/caps/jingle-caps.py                  |   51 +-
 tests/twisted/cm/protocol.py                       |    5 +-
 tests/twisted/console.py                           |   14 +-
 tests/twisted/constants.py                         |   14 +
 .../twisted/file-transfer/file_transfer_helper.py  |   12 +-
 tests/twisted/gabbletest.py                        |   39 +-
 tests/twisted/jingle-share/file_transfer_helper.py |   12 +-
 tests/twisted/jingle-share/jingleshareutils.py     |    7 +-
 tests/twisted/jingle-share/test-multift.py         |   62 +-
 .../test-send-file-send-before-accept.py           |    4 +
 tests/twisted/jingle/call-muc-cancel.py            |    4 +-
 tests/twisted/jingle/call-muc-re-re-request.py     |   16 +-
 tests/twisted/jingle/decloak-peer.py               |   22 +-
 tests/twisted/jingle/google-relay.py               |   20 +-
 .../twisted/jingle/incoming-gmail-modern-jingle.py |    9 +-
 tests/twisted/jingle/jingletest.py                 |  227 --
 tests/twisted/jingle/jingletest2.py                |   27 +-
 tests/twisted/jingle/outgoing-ensure.py            |    7 +-
 tests/twisted/jingle/outgoing-many-streams.py      |   27 +-
 tests/twisted/jingle/payload-types.py              |   47 +-
 tests/twisted/jingle/stream-handler-error.py       |    8 +-
 tests/twisted/jingle/stun-server.py                |  213 +-
 .../jingle/test-wait-for-caps-incomplete.py        |   20 +-
 tests/twisted/jingle/test-wait-for-caps.py         |   31 +-
 tests/twisted/jingle/unknown-session.py            |   38 +
 tests/twisted/main-debug.c                         |   64 +-
 tests/twisted/muc/chat-states.py                   |  108 +-
 tests/twisted/muc/send-error.py                    |  122 +-
 tests/twisted/mucutil.py                           |    2 +-
 tests/twisted/ns.py                                |    3 +
 tests/twisted/presence/invisible_xep_0126.py       |   60 +-
 tests/twisted/run-test.sh.in                       |   19 +-
 tests/twisted/sasl/abort.py                        |  174 +-
 tests/twisted/sasl/saslutil.py                     |   31 +-
 tests/twisted/servicetest.py                       |   21 +-
 tests/twisted/test-resolver.h                      |    1 -
 tests/twisted/text/receipts.py                     |  197 ++
 tests/twisted/text/test-chat-state.py              |   95 +-
 tests/twisted/tls/server-tls-channel.py            |   16 +-
 tests/twisted/tools/exec-with-log.sh.in            |    2 +
 tests/twisted/tubes/accept-muc-dbus-tube.py        |   19 +-
 tests/twisted/tubes/accept-muc-stream-tube.py      |   78 +-
 tests/twisted/tubes/accept-private-dbus-tube.py    |   59 +-
 tests/twisted/tubes/accept-private-stream-tube.py  |  139 +-
 tests/twisted/tubes/check-create-tube-return.py    |   24 -
 tests/twisted/tubes/close-muc-with-closed-tube.py  |   49 +-
 tests/twisted/tubes/ensure-si-tube.py              |   66 +-
 tests/twisted/tubes/offer-muc-dbus-tube.py         |  230 +-
 tests/twisted/tubes/offer-muc-stream-tube.py       |  218 +-
 tests/twisted/tubes/offer-no-caps.py               |   22 +-
 tests/twisted/tubes/offer-private-dbus-tube.py     |  126 +-
 tests/twisted/tubes/offer-private-stream-tube.py   |  180 +-
 tests/twisted/tubes/test-get-available-tubes.py    |   62 +-
 tests/twisted/tubes/test-socks5-muc.py             |   24 +-
 tests/twisted/tubes/tubetestutil.py                |   18 -
 tests/twisted/vcard/clear-avatar.py                |   27 +
 tests/twisted/vcard/overlapping-sets.py            |   15 +-
 tests/twisted/vcard/set-avatar.py                  |   55 +
 tests/twisted/vcard/set-set-disconnect.py          |    8 +-
 tests/twisted/vcard/supported-fields.py            |    1 +
 tests/twisted/vcard/test-vcard-race.py             |    6 +-
 tools/Makefile.am                                  |   59 +-
 tools/Makefile.in                                  |  152 +-
 tools/c-constants-gen.py                           |   37 +-
 tools/check-c-style.sh                             |    7 -
 tools/flymake.mk                                   |    4 +
 tools/git-which-branch.sh                          |   25 +
 tools/glib-client-gen.py                           | 1269 ++++++++++
 tools/glib-client-marshaller-gen.py                |   60 +
 tools/glib-errors-check-gen.py                     |   58 +
 tools/glib-errors-str-gen.py                       |   83 +
 tools/glib-ginterface-gen.py                       |   25 +-
 tools/glib-gtypes-generator.py                     |   28 +-
 tools/glib-interfaces-gen.py                       |   22 +-
 tools/glib-signals-marshal-gen.py                  |   55 -
 tools/gobject-foo.py                               |   90 +
 tools/lcov.am                                      |    1 +
 tools/libtpcodegen.py                              |   14 +-
 tools/make-version-script.py                       |  208 ++
 tools/manager-file.py                              |  187 ++
 tools/shave.mk                                     |    1 +
 tools/telepathy-glib-env.in                        |    9 +
 tools/telepathy-glib.supp                          |  390 ++++
 tools/test-wrapper.sh                              |   30 +
 tools/with-session-bus.sh                          |  100 +
 412 files changed, 22066 insertions(+), 12463 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-gabble.git



More information about the Pkg-telepathy-commits mailing list