[Pkg-telepathy-commits] [telepathy-mission-control-5] 56/62: Merge branch 'upstream-experimental' into upstream
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 e7dc1efd6aaa11f7eec323013b927e9dca3d475c
Merge: 9638aa3 a32599d
Author: Simon McVittie <smcv at debian.org>
Date: Thu Sep 19 14:41:42 2013 +0100
Merge branch 'upstream-experimental' into upstream
Conflicts:
ChangeLog
NEWS
configure
configure.ac
doc/reference/mission-control-plugins/html/ch01.html
doc/reference/mission-control-plugins/html/ch02.html
doc/reference/mission-control-plugins/html/ch03.html
doc/reference/mission-control-plugins/html/ch04.html
doc/reference/mission-control-plugins/html/mission-control-plugins-McpAccountStorage.html
doc/reference/mission-control-plugins/html/mission-control-plugins-McpDispatchOperationPolicy.html
doc/reference/mission-control-plugins/html/mission-control-plugins-McpRequestPolicy.html
ltmain.sh
mission-control-plugins/account-storage.c
server/Makefile.in
src/Makefile.in
src/mcd-account-manager-default.c
src/mcd-account-manager.c
src/mcd-account.c
src/mcd-channel.c
src/mcd-connection.c
util/wait-for-name.c
ChangeLog | 3004 ++++++++++++++++++--
Makefile.am | 6 +-
Makefile.in | 18 +-
NEWS | 192 +-
aclocal.m4 | 12 -
config.h.in | 21 +-
configure | 312 +-
configure.ac | 83 +-
data/Makefile.in | 2 -
doc/Makefile.in | 2 -
doc/reference/Makefile.in | 2 -
doc/reference/mission-control-plugins/Makefile.in | 2 -
.../html/McpAccountManager.html | 319 ++-
.../html/McpDispatchOperation.html | 36 +-
.../html/annotation-glossary.html | 11 +-
.../html/api-index-full.html | 110 +-
.../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.sgml | 43 +-
.../mission-control-plugins-McpAccountStorage.html | 979 ++++---
...control-plugins-McpDispatchOperationPolicy.html | 10 +-
.../mission-control-plugins-McpRequestPolicy.html | 2 +-
.../html/mission-control-plugins.devhelp2 | 43 +-
.../mission-control-plugins-sections.txt | 51 +-
.../mission-control-plugins.types | 1 -
ltmain.sh | 4 +-
m4/Makefile.in | 2 -
m4/libtool.m4 | 12 +-
mission-control-plugins/Makefile.am | 3 +-
mission-control-plugins/Makefile.in | 8 +-
mission-control-plugins/account-storage.c | 694 ++++-
mission-control-plugins/account-storage.h | 98 +-
mission-control-plugins/account.c | 242 +-
mission-control-plugins/account.h | 31 +
mission-control-plugins/dbus-acl.h | 2 +-
.../dispatch-operation-policy.c | 2 +
.../dispatch-operation-policy.h | 3 +-
mission-control-plugins/dispatch-operation.c | 29 +-
mission-control-plugins/dispatch-operation.h | 2 +-
mission-control-plugins/implementation.h | 27 +
mission-control-plugins/loader.c | 2 +
mission-control-plugins/mission-control-plugins.h | 10 +
mission-control-plugins/request-policy.c | 2 +
mission-control-plugins/request.c | 6 +-
mission-control.pc.in | 13 -
plugins/Makefile.in | 2 -
plugins/mcp-dbus-aegis-acl.c | 8 +-
server/Makefile.am | 8 +-
server/Makefile.in | 100 +-
server/mc-server.c | 8 +-
src/Makefile.am | 83 +-
src/Makefile.in | 399 +--
src/channel-utils.c | 33 +-
src/channel-utils.h | 3 +-
src/client-registry.c | 102 +-
src/client-registry.h | 6 +-
src/connectivity-monitor.c | 62 +-
src/gtypes.c | 2 +
src/kludge-transport.c | 19 +-
src/kludge-transport.h | 5 +-
src/mcd-account-addressing.c | 60 +-
src/mcd-account-addressing.h | 2 +-
src/mcd-account-compat.c | 160 --
src/mcd-account-conditions.c | 35 +-
src/mcd-account-config.h | 49 +-
src/mcd-account-connection.c | 3 +-
src/mcd-account-manager-default.c | 206 +-
src/mcd-account-manager-priv.h | 10 -
src/mcd-account-manager-query.c | 368 ---
src/mcd-account-manager-sso.c | 68 +-
src/mcd-account-manager-sso.h | 1 -
src/mcd-account-manager.c | 278 +-
src/mcd-account-manager.h | 15 +-
src/mcd-account-priv.h | 16 +-
src/mcd-account-requests.c | 8 +-
src/mcd-account.c | 1583 +++++++----
src/mcd-account.h | 17 +-
src/mcd-channel-priv.h | 3 -
src/mcd-channel.c | 333 +--
src/mcd-channel.h | 15 +-
src/mcd-client-priv.h | 16 +-
src/mcd-client.c | 165 +-
src/mcd-connection-plugin.h | 10 +-
src/mcd-connection-priv.h | 8 +-
src/mcd-connection-service-points.c | 9 +-
src/mcd-connection.c | 946 ++----
src/mcd-connection.h | 16 +-
src/mcd-controller.c | 139 -
src/mcd-controller.h | 63 -
src/mcd-dbusprop.c | 127 +-
src/mcd-dbusprop.h | 44 +-
src/mcd-debug.c | 21 +-
src/mcd-debug.h | 16 +-
src/mcd-dispatch-operation-priv.h | 14 +-
src/mcd-dispatch-operation.c | 433 ++-
src/mcd-dispatcher-context.h | 113 -
src/mcd-dispatcher-priv.h | 19 +-
src/mcd-dispatcher.c | 859 +-----
src/mcd-dispatcher.h | 9 +-
src/mcd-handler-map-priv.h | 3 +-
src/mcd-handler-map.c | 2 +-
src/mcd-manager-priv.h | 2 +-
src/mcd-manager.c | 142 +-
src/mcd-manager.h | 8 -
src/mcd-master.c | 277 +-
src/mcd-master.h | 21 +-
src/mcd-misc.c | 57 +-
src/mcd-misc.h | 12 +-
src/mcd-mission.c | 18 +-
src/mcd-mission.h | 16 +-
src/mcd-operation.c | 2 +
src/mcd-plugin.h | 46 -
src/mcd-provisioning-factory.c | 135 -
src/mcd-provisioning-factory.h | 65 -
src/mcd-provisioning.c | 122 -
src/mcd-provisioning.h | 82 -
src/mcd-proxy.c | 226 --
src/mcd-proxy.h | 59 -
src/mcd-service.c | 13 +-
src/mcd-signals-marshal.list | 19 -
src/mcd-slacker.c | 238 +-
src/mcd-slacker.h | 2 +-
src/mcd-storage-ag-hidden.c | 5 +-
src/mcd-storage-priv.h | 35 -
src/mcd-storage.c | 2226 +++++++++++++--
src/mcd-storage.h | 148 +-
src/mcd-transport.c | 21 +-
src/mcd-transport.h | 2 -
src/mcd.xml | 3 -
src/plugin-account.c | 911 ------
src/plugin-account.h | 81 -
src/plugin-dispatch-operation.c | 38 +-
src/plugin-request.c | 2 +
src/request.c | 45 +-
src/request.h | 3 +-
tests/Makefile.am | 9 +-
tests/Makefile.in | 25 +-
tests/account-store-default.c | 62 +-
tests/account-store-default.h | 2 +
tests/account-store-libaccounts.c | 22 +-
tests/account-store-libaccounts.h | 6 +
tests/account-store.c | 28 +-
tests/keyfile.c | 351 +++
tests/keyring-command.c | 2 +
tests/tease-the-minotaur.c | 2 +
tests/twisted/Makefile.am | 48 +-
tests/twisted/Makefile.in | 167 +-
tests/twisted/account-manager/account-basics.py | 147 +-
tests/twisted/account-manager/auto-away.py | 208 --
tests/twisted/account-manager/auto-connect.py | 73 +-
tests/twisted/account-manager/avatar-persist.py | 101 +-
tests/twisted/account-manager/avatar-refresh.py | 63 +-
tests/twisted/account-manager/avatar.py | 84 +-
.../account-manager/backend-makes-changes.py | 350 +++
.../account-manager/create-with-properties.py | 10 -
tests/twisted/account-manager/device-idle.py | 81 +-
tests/twisted/account-manager/irc.py | 127 +
tests/twisted/account-manager/make-valid.py | 85 +-
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 | 130 +-
tests/twisted/account-storage/diverted-storage.py | 17 +-
tests/twisted/account/addressing.py | 30 +-
tests/twisted/capabilities/legacy-caps.py | 85 -
tests/twisted/constants.py | 18 +-
tests/twisted/crash-recovery/crash-recovery.py | 43 +-
tests/twisted/dbus-account-plugin.c | 1612 +++++++++++
tests/twisted/dbus-account-plugin.h | 50 +
tests/twisted/dispatcher/create-at-startup.py | 47 +-
.../twisted/dispatcher/create-delayed-by-plugin.py | 166 --
.../dispatcher/dispatch-delayed-by-plugin.py | 272 --
.../dispatcher/dispatch-rejected-by-plugin.py | 239 --
tests/twisted/dispatcher/exploding-bundles.py | 156 +-
tests/twisted/fakeaccountsservice.py | 188 ++
tests/twisted/fakeconnectivity.py | 17 +-
tests/twisted/mc-debug-server.c | 73 +-
tests/twisted/mcp-account-diversion.c | 18 +-
tests/twisted/mcp-plugin.c | 21 +-
tests/twisted/mctest.py | 75 +-
tests/twisted/servicetest.py | 11 +-
tests/twisted/test-plugin.c | 227 --
tests/twisted/tools/Makefile.in | 2 -
tests/twisted/tools/exec-with-log.sh.in | 4 +
tests/twisted/tools/with-session-bus.sh | 6 +
tests/value-is-same.c | 16 +-
tools/Makefile.am | 1 +
tools/Makefile.in | 3 +-
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 +-
tools/run_and_bt.gdb | 7 +
util/Makefile.am | 6 +-
util/Makefile.in | 13 +-
util/mc-tool.c | 159 +-
util/wait-for-name.c | 3 +
xml/Account_Interface_Addressing.xml | 76 -
xml/Account_Interface_Compat.xml | 65 -
xml/Account_Manager_Interface_Query.xml | 75 -
xml/Makefile.am | 3 -
xml/Makefile.in | 5 -
xml/nmc5.xml | 3 -
207 files changed, 14788 insertions(+), 10847 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