[Pkg-telepathy-commits] [telepathy-mission-control-6] 47/280: Merge branch 'master' into next

[Simon McVittie]

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

smcv pushed a commit to branch debian
in repository telepathy-mission-control-6.

commit 9be91eed18769743233b2e569170f1512d89b2ad
Merge: 8f2843d f60c9aa
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Fri Oct 4 13:05:23 2013 +0100

    Merge branch 'master' into next
    
    Conflicts:
    	tests/twisted/constants.py

 NEWS                                               |  45 ++-
 configure.ac                                       |   4 +-
 mission-control-plugins/Makefile.am                |   4 +-
 plugins/Makefile.am                                |   2 +-
 server/Makefile.am                                 |   2 +-
 src/Makefile.am                                    |  14 +-
 src/mcd-account.c                                  | 123 +++++--
 src/mcd-connection-service-points.c                |  50 +--
 src/mcd-connection.c                               |  35 +-
 tests/Makefile.am                                  |   4 +-
 tests/twisted/Makefile.am                          |   4 +-
 tests/twisted/account-manager/avatar-persist.py    | 185 ----------
 tests/twisted/account-manager/avatar-refresh.py    | 392 +++++++++++++++++----
 tests/twisted/account-manager/irc.py               |  28 +-
 tests/twisted/account-manager/nickname.py          |   6 +-
 tests/twisted/account-manager/presence.py          |  12 +-
 tests/twisted/capabilities/contact-caps.py         |  22 +-
 tests/twisted/constants.py                         |   3 +
 tests/twisted/dbus-account-plugin.c                |   3 +
 tests/twisted/dispatcher/already-has-channel.py    |  22 +-
 tests/twisted/dispatcher/already-has-obsolete.py   | 128 -------
 .../dispatcher/dispatch-before-connected.py        |  14 +-
 tests/twisted/mctest.py                            | 154 ++++++--
 tests/twisted/run-test.sh.in                       |  14 +-
 tests/twisted/servicetest.py                       |   9 +-
 tests/twisted/tools/Makefile.am                    |   8 +-
 tools/lcov.am                                      |   2 +-
 util/Makefile.am                                   |   2 +-
 28 files changed, 715 insertions(+), 576 deletions(-)

diff --cc tests/twisted/constants.py
index 9afe44e,68c458a..59cc46e
--- a/tests/twisted/constants.py
+++ b/tests/twisted/constants.py
@@@ -184,27 -196,31 +184,30 @@@ CONTACT_LIST_STATE_FAILURE = 
  CONTACT_LIST_STATE_SUCCESS = 3
  
  CONN = PREFIX + ".Connection"
 -CONN_IFACE_AVATARS = CONN + '.Interface.Avatars'
 -CONN_IFACE_ALIASING = CONN + '.Interface.Aliasing'
 -CONN_IFACE_CAPS = CONN + '.Interface.Capabilities'
 +CONN_IFACE_AVATARS = CONN + '.Interface.Avatars1'
 +CONN_IFACE_ALIASING = CONN + '.Interface.Aliasing1'
  CONN_IFACE_CONTACTS = CONN + '.Interface.Contacts'
 -CONN_IFACE_CONTACT_CAPS = CONN + '.Interface.ContactCapabilities'
 -CONN_IFACE_CONTACT_INFO = CONN + ".Interface.ContactInfo"
 -CONN_IFACE_PRESENCE = CONN + '.Interface.Presence'
 -CONN_IFACE_SIMPLE_PRESENCE = CONN + '.Interface.SimplePresence'
 +CONN_IFACE_CONTACT_CAPS = CONN + '.Interface.ContactCapabilities1'
 +CONN_IFACE_CONTACT_INFO = CONN + ".Interface.ContactInfo1"
 +CONN_IFACE_PRESENCE = CONN + '.Interface.Presence1'
  CONN_IFACE_REQUESTS = CONN + '.Interface.Requests'
 -CONN_IFACE_LOCATION = CONN + '.Interface.Location'
 +CONN_IFACE_LOCATION = CONN + '.Interface.Location1'
  CONN_IFACE_GABBLE_DECLOAK = CONN + '.Interface.Gabble.Decloak'
 -CONN_IFACE_MAIL_NOTIFICATION = CONN + '.Interface.MailNotification'
 -CONN_IFACE_CONTACT_LIST = CONN + '.Interface.ContactList'
 -CONN_IFACE_CONTACT_GROUPS = CONN + '.Interface.ContactGroups'
 -CONN_IFACE_CLIENT_TYPES = CONN + '.Interface.ClientTypes'
 -CONN_IFACE_POWER_SAVING = CONN + '.Interface.PowerSaving'
 -CONN_IFACE_CONTACT_BLOCKING = CONN + '.Interface.ContactBlocking'
 +CONN_IFACE_MAIL_NOTIFICATION = CONN + '.Interface.MailNotification1'
 +CONN_IFACE_CONTACT_LIST = CONN + '.Interface.ContactList1'
 +CONN_IFACE_CONTACT_GROUPS = CONN + '.Interface.ContactGroups1'
 +CONN_IFACE_CLIENT_TYPES = CONN + '.Interface.ClientTypes1'
 +CONN_IFACE_POWER_SAVING = CONN + '.Interface.PowerSaving1'
 +CONN_IFACE_CONTACT_BLOCKING = CONN + '.Interface.ContactBlocking1'
  CONN_IFACE_ADDRESSING = CONN + '.Interface.Addressing1'
 -CONN_IFACE_SERVICE_POINT = CONN + '.Interface.ServicePoint'
 +CONN_IFACE_SERVICE_POINT = CONN + '.Interface.ServicePoint1'
  
  ATTR_CONTACT_ID = CONN + '/contact-id'
+ ATTR_ALIAS = CONN_IFACE_ALIASING + '/alias'
+ ATTR_AVATAR_TOKEN = CONN_IFACE_AVATARS + '/token'
++ATTR_CONTACT_ID = CONN + '/contact-id'
  ATTR_CONTACT_CAPABILITIES = CONN_IFACE_CONTACT_CAPS + '/capabilities'
 -ATTR_PRESENCE = CONN_IFACE_SIMPLE_PRESENCE + '/presence'
 +ATTR_PRESENCE = CONN_IFACE_PRESENCE + '/presence'
  ATTR_SUBSCRIBE = CONN_IFACE_CONTACT_LIST + '/subscribe'
  ATTR_PUBLISH = CONN_IFACE_CONTACT_LIST + '/publish'
  ATTR_GROUPS = CONN_IFACE_CONTACT_GROUPS + '/groups'

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