[next] telepathy-salut: Revert to commit 822ddd0
Simon McVittie
smcv at kemper.freedesktop.org
Thu Feb 6 11:27:49 PST 2014
Module: telepathy-salut
Branch: next
Commit: b81df5f0da5a86fe5bef05f3d8d627f6a01cee76
URL: http://cgit.freedesktop.org/telepathy/telepathy-salut/commit/?id=b81df5f0da5a86fe5bef05f3d8d627f6a01cee76
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date: Thu Feb 6 19:18:35 2014 +0000
Revert to commit 822ddd0
Some commits intended for 'next' appear to have ended up on master.
---
.gitignore | 4 +-
configure.ac | 31 +-
data/Makefile.am | 4 +-
data/salut.service.in | 2 +-
extensions/Connection_Future.xml | 12 +-
extensions/Makefile.am | 2 +
extensions/OLPC_Activity_Properties.xml | 124 ++
extensions/OLPC_Buddy_Info.xml | 285 ++++
extensions/Salut_Plugin_Test.xml | 2 +-
extensions/connection.xml | 3 +
plugins/test.c | 2 +-
salut/capabilities.h | 1 +
src/Makefile.am | 14 +
src/avahi-contact.c | 72 +
src/avahi-discovery-client.c | 32 +-
src/avahi-olpc-activity-manager.c | 376 +++++
src/avahi-olpc-activity-manager.h | 68 +
src/avahi-olpc-activity.c | 546 +++++++
src/avahi-olpc-activity.h | 70 +
src/avahi-self.c | 134 +-
src/avahi-self.h | 3 +-
src/bonjour-discovery-client.c | 6 +-
src/bonjour-self.c | 12 +-
src/bonjour-self.h | 3 +-
src/capability-set.c | 23 +
src/connection-contact-info.c | 49 +
src/connection.c | 1720 +++++++++++++++++++-
src/connection.h | 10 +
src/contact-manager.c | 5 +-
src/contact.c | 255 +++
src/contact.h | 43 +
src/debug.c | 1 +
src/debug.h | 5 +-
src/discovery-client.c | 21 +-
src/discovery-client.h | 18 +-
src/dummy-discovery-client.c | 7 +-
src/file-transfer-channel.c | 4 +-
src/im-channel.c | 23 +-
src/muc-channel.c | 134 +-
src/muc-manager.c | 9 +-
src/muc-tube-dbus.c | 2 -
src/muc-tube-stream.c | 2 -
src/namespaces.h | 8 +
src/olpc-activity-manager.c | 349 ++++
src/olpc-activity-manager.h | 98 ++
src/olpc-activity.c | 680 ++++++++
src/olpc-activity.h | 98 ++
src/presence.h | 1 +
src/protocol.c | 3 +-
src/protocol.h | 4 +-
src/roomlist-channel.c | 8 +-
src/self.c | 480 ++++++
src/self.h | 44 +
src/text-helper.h | 2 +-
src/tube-dbus.c | 7 +-
src/tube-iface.c | 4 +-
src/tube-stream.c | 14 +-
src/tubes-manager.c | 34 +-
src/util.h | 6 -
src/write-mgr-file.c | 12 +-
tests/twisted/Makefile.am | 8 +
tests/twisted/avahi/aliases.py | 11 +-
tests/twisted/avahi/caps-file-transfer.py | 8 +-
tests/twisted/avahi/caps-self.py | 2 +-
tests/twisted/avahi/close-local-pending-room.py | 10 +-
.../avahi/file-transfer/file_transfer_helper.py | 10 +-
.../twisted/avahi/file-transfer/ft-client-caps.py | 14 +-
tests/twisted/avahi/ichat-composing.py | 8 +-
tests/twisted/avahi/ichat-incoming-msg.py | 10 +-
tests/twisted/avahi/muc-invite.py | 11 +-
tests/twisted/avahi/olpc-activity-announcements.py | 115 ++
tests/twisted/avahi/request-im.py | 8 +-
tests/twisted/avahi/request-muc.py | 6 +-
tests/twisted/avahi/roomlist.py | 11 +-
tests/twisted/avahi/set-presence.py | 4 +-
tests/twisted/avahi/text-channel.py | 15 +-
tests/twisted/avahi/tubes/request-muc-tubes.py | 6 +-
tests/twisted/avahi/tubes/tubetestutil.py | 10 +-
tests/twisted/avahi/tubes/two-muc-dbus-tubes.py | 4 +-
tests/twisted/cm/protocol.py | 6 +-
tests/twisted/constants.py | 205 +--
tests/twisted/ns.py | 10 +
tests/twisted/saluttest.py | 24 +-
tests/twisted/servicetest.py | 249 +--
tests/twisted/sidecars.py | 2 +-
tests/twisted/tools/Makefile.am | 4 +-
tests/twisted/tools/salut.service.in | 2 +-
87 files changed, 6118 insertions(+), 646 deletions(-)
Diff: http://cgit.freedesktop.org/telepathy/telepathy-salut/diff/?id=b81df5f0da5a86fe5bef05f3d8d627f6a01cee76
More information about the telepathy-commits
mailing list