[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/smcv/public_html/darcs/gabble-smcv-group

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Use actual dbus-python API to call GetHandleOwners in test-muc-ownership

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Consider the self handle to be owned by the connection's self handle, even if the MUC service doesn't explicitly say so

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleMediaChannel: use less strange API to hook up D-Bus properties

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    tests/twisted/olpc/olpc-muc-invitation.py: remove race condition between stream-presence and MembersChanged

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleRosterChannel: avoid initializing static data twice if we're subclassed

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add self-handle owner before adding ourselves to local-pending set

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleMUCChannel: use less strange API to hook up D-Bus properties

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleMucFactory: don't leak the room handle when processing an invitation

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleMucChannel: avoid initializing static data twice if we're subclassed

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleMucChannel: remove pointless guard against multiple initialization - class_init can only run once anyway

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleMediaChannel: make it clearer exactly what is being passed to tp_group_mixin_init_dbus_properties

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Don't clear HANDLE_OWNERS_NOT_AVAILABLE just because our own handle in a MUC has an owner

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Require released version 0.7.10 of telepathy-glib

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Require telepathy-glib 0.7.8.1 devel version (for properties-based Group)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Unconditionally add handle owners when adding members due to presence
Note that telepathy-glib <= 0.7.8 will assert if we add handle owners that are
zero, so this change requires the version with Group properties.

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Implement Group properties on StreamedMedia channels

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Port test-muc-ownership.py to the new API

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleRosterChannel: make it clearer exactly what is being passed to tp_group_mixin_init_dbus_properties

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add our own handle owner when joining a MUC channel

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add basic support for Group properties to MUC channel

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleMediaChannel: remove pointless guard against multiple initialization - class_init() only runs once

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    test-muc-ownership: exercise D-Bus properties

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleRosterChannel: use less strange API to hook up D-Bus properties

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    gabble_muc_channel_add_member: clarify code where we're adding ourselves to remote pending while removing the inviter JID from the members

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Annotate why we are not adding an owner for the inviter handle

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    test-muc-ownership.py: exercise HandleOwnersChanged

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    In Gabble MUC channels, aggregate initial handle ownership as well as initial handles

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add a comment explaining what's going on with MUC joins if we don't get the name we asked for

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Before adding ourselves to a requested MUC channel, add our handle-owner

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Use make -C in tests/README

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    test-muc-ownership: expect the local self-handle to be owned by the global self-handle

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Implement Group properties on roster channels

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleRosterChannel: remove pointless guard against multiple initialization - class_init() only runs once

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleMediaChannel: avoid initializing static data twice

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleMucChannel: make it clearer exactly what is being passed to tp_group_mixin_init_dbus_properties

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    olpc-muc-prop-change: be independent of relative ordering of stream-presence and MembersChanged

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Remove two unnecessary refs to the self-handle per MUC channel
Note that this will probably assert if the group mixin does not ref the
self-handle itself (this functionality was added after 0.7.8).