[Pkg-telepathy-commits] [telepathy-mission-control-5] 57/62: Merge branch 'upstream-experimental' into debian
Simon McVittie
smcv at alioth.debian.org
Thu Sep 19 14:18:06 UTC 2013
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch debian
in repository telepathy-mission-control-5.
commit 4b25e2c6f89d5457c9acb40005ff7df5539aab4a
Merge: b6a9fe2 a32599d
Author: Simon McVittie <smcv at debian.org>
Date: Thu Sep 19 14:43:27 2013 +0100
Merge branch 'upstream-experimental' into debian
ChangeLog | 1145 +++++++++++++-
Makefile.am | 2 +-
Makefile.in | 2 +-
NEWS | 75 +
config.h.in | 8 +-
configure | 83 +-
configure.ac | 19 +-
doc/reference/mission-control-plugins/Makefile.am | 12 +-
doc/reference/mission-control-plugins/Makefile.in | 12 +-
.../html/McpAccountManager.html | 319 +++-
.../html/annotation-glossary.html | 11 +-
.../html/api-index-full.html | 122 +-
.../mission-control-plugins/html/ch01.html | 2 +-
.../mission-control-plugins/html/ch02.html | 2 +-
.../mission-control-plugins/html/ch03.html | 2 +-
.../mission-control-plugins/html/ch04.html | 2 +-
.../mission-control-plugins/html/index.html | 4 +-
.../mission-control-plugins/html/index.sgml | 40 +-
.../mission-control-plugins-McpAccountStorage.html | 866 ++++++-----
...control-plugins-McpDispatchOperationPolicy.html | 2 +-
.../mission-control-plugins-McpRequestPolicy.html | 2 +-
.../html/mission-control-plugins.devhelp2 | 38 +-
.../mission-control-plugins-docs.sgml | 4 +-
.../mission-control-plugins-sections.txt | 46 +-
.../mission-control-plugins.types | 1 -
mission-control-plugins/account-storage.c | 543 ++++++-
mission-control-plugins/account-storage.h | 65 +-
mission-control-plugins/account.c | 240 ++-
mission-control-plugins/account.h | 31 +
mission-control-plugins/dispatch-operation.c | 22 +-
mission-control-plugins/implementation.h | 27 +
mission-control-plugins/mission-control-plugins.h | 10 +
server/mc-server.c | 2 +
src/Makefile.am | 11 +-
src/Makefile.in | 12 +-
src/channel-utils.c | 24 +-
src/client-registry.c | 9 +-
src/client-registry.h | 2 +-
src/connectivity-monitor.c | 60 +-
src/mcd-account-addressing.c | 44 +-
src/mcd-account-conditions.c | 23 +-
src/mcd-account-config.h | 49 +-
src/mcd-account-manager-default.c | 20 +-
src/mcd-account-manager-sso.c | 28 +-
src/mcd-account-manager.c | 91 +-
src/mcd-account-manager.h | 3 +-
src/mcd-account-priv.h | 1 +
src/mcd-account.c | 1007 ++++++++----
src/mcd-account.h | 2 +-
src/mcd-channel-priv.h | 3 -
src/mcd-channel.c | 48 +-
src/mcd-channel.h | 2 +
src/mcd-client-priv.h | 7 +-
src/mcd-client.c | 26 +-
src/mcd-connection-priv.h | 3 -
src/mcd-connection.c | 680 +++------
src/mcd-dbusprop.c | 3 +-
src/mcd-dbusprop.h | 12 +-
src/mcd-debug.h | 11 +
src/mcd-dispatch-operation.c | 12 +-
src/mcd-dispatcher.c | 43 +-
src/mcd-manager-priv.h | 2 +-
src/mcd-manager.c | 18 +-
src/mcd-master.c | 14 +-
src/mcd-misc.c | 13 +
src/mcd-misc.h | 2 +
src/mcd-slacker.c | 232 ++-
src/mcd-slacker.h | 2 +-
src/mcd-storage.c | 1304 +++++++++++++---
src/mcd-storage.h | 68 +-
src/plugin-dispatch-operation.c | 14 +-
src/request.c | 31 +-
src/request.h | 1 +
tests/Makefile.am | 9 +-
tests/Makefile.in | 23 +-
tests/keyfile.c | 351 +++++
tests/keyring-command.c | 2 +
tests/tease-the-minotaur.c | 2 +
tests/twisted/Makefile.am | 10 +-
tests/twisted/Makefile.in | 28 +-
tests/twisted/account-manager/account-basics.py | 110 +-
tests/twisted/account-manager/auto-connect.py | 68 +-
tests/twisted/account-manager/avatar-persist.py | 46 +-
tests/twisted/account-manager/avatar-refresh.py | 46 +-
tests/twisted/account-manager/avatar.py | 61 +-
.../account-manager/backend-makes-changes.py | 350 +++++
tests/twisted/account-manager/device-idle.py | 81 +-
tests/twisted/account-manager/irc.py | 127 ++
tests/twisted/account-manager/make-valid.py | 80 +-
tests/twisted/account-manager/nickname.py | 146 +-
tests/twisted/account-manager/req-conn-fails.py | 63 +
tests/twisted/account-manager/update-parameters.py | 37 +-
.../account-storage/default-keyring-storage.py | 4 +-
tests/twisted/account-storage/diverted-storage.py | 2 +-
tests/twisted/account/addressing.py | 30 +-
tests/twisted/constants.py | 16 +
tests/twisted/crash-recovery/crash-recovery.py | 38 +-
tests/twisted/dbus-account-plugin.c | 1612 ++++++++++++++++++++
tests/twisted/dbus-account-plugin.h | 50 +
tests/twisted/dispatcher/create-at-startup.py | 42 +-
tests/twisted/fakeaccountsservice.py | 188 +++
tests/twisted/fakeconnectivity.py | 17 +-
tests/twisted/mc-debug-server.c | 18 +-
tests/twisted/mcp-account-diversion.c | 18 +-
tests/twisted/mcp-plugin.c | 8 +
tests/twisted/mctest.py | 70 +-
tests/twisted/servicetest.py | 1 +
tools/glib-client-gen.py | 319 ++--
tools/glib-client-marshaller-gen.py | 3 +-
tools/glib-ginterface-gen.py | 207 ++-
tools/glib-gtypes-generator.py | 193 +--
tools/libglibcodegen.py | 3 +-
tools/libtpcodegen.py | 24 +-
util/mc-tool.c | 36 +-
util/wait-for-name.c | 3 +
115 files changed, 9550 insertions(+), 2690 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-mission-control-5.git
More information about the Pkg-telepathy-commits
mailing list