[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

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

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabblePrivateTubesFactory: also replace g_return_val_if_fail with g_assert here

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Test the Requested property for Tubes

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleMucChannel: assert that there is an initiator

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    roster/test-roster.py, roster/test-roster-subscribe.py: exercise future properties

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Test the Requested property for MUCs

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Loosen assumptions in muc-factory about what channels will be ready when

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Update Channel.FUTURE, and actually remember to add Connection.Interface.Requests XML

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add Requests interface in extensions/, and update Channel.FUTURE to the -requestotron branch

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Split out incoming call rejection into a separate test so we have an active regression test for the FUTURE properties

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    jingle/test-incoming-call.py: exercise channel properties in a basic way

This test is disabled, but the basic functionality has been verified.

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Allow undefined (external) interfaces in extensions

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Fix end of call in test for call rejection

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    tests/twisted/jingle/: exercise the Requested property

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleMediaChannel: ref priv->creator

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleRosterChannel: remove FIXME comments, Sjoerd thinks the current implementation is fine

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Test the Requested property for roster channels

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleMucFactory: move responsibility for handling invitations inside new_muc_channel

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleRosterChannel: implement a simplistic version of future properties

For now, the initiator is always set to 0, even if the user actually requested
the channel.

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    tubes/test-muc-accept-stream-tube-ibb.py: exercise TargetID/Initiator* for tube initiated by others

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Revert g_return_val_if_fail in GabbleMediaFactory internals to a g_assert, having it return NULL is no more helpful

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleRoomlistChannel: add the Requested property

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Make test-incoming-call.py a little more race-resistant

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleMediaChannel: add the Requested property

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Pass invitations into MUC channels as a construct-time property instead of calling a function afterwards

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleIMChannel: add a Requested property

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleMucChannel: add the Requested property

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    tubes/test-si-tubes.py: exercise TargetID/Initiator* for tubes initiated by us

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleImFactory: simplify priv access

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleTubesChannel: take an initiator handle, and also export TargetID and InitiatorID

The initiator of a Tubes channel is (currently) defined to be
* the local user, if it was requested; or
* the remote user, if it is 1-1; or
* 0, otherwise (we saw it in someone's presence in a MUC)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleMediaFactory: coding style/naming consistency

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleMediaFactory: assert that the channel has a creator

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Resolve conflict with daf

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Test the Requested property for IM channels

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    muc/test-muc-invitation.py: exercise future channel properties

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Implement the "respawning" behaviour for IM channels with pending messages remaining

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Remove unnecessary check that media channel has nonzero creator - we already asserted that in the constructor

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleTubesChannel: add the Requested property

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    jingle/test-outgoing-call*.py: exercise future properties

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleMucChannel: order headers according to coding style

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    tubes/test-muc-offer-dbus-tube.py: exercise TargetID/Initiator* for Tubes channel initiated by us

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add a regression test for respawning text channels

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleMucChannel: add InitiatorID, InitiatorHandle, TargetID properties

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleMediaChannel: export TargetID, InitiatorID, InitiatorHandle D-Bus properties

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add basic support for future properties in room lists

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    muc/roomlist.py: exercise the Requested property

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleIMChannel: assert that there is an initiator

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    muc/test-muc.py: exercise future channel properties

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GabbleRosterChannel: add the Requested property (trivial implementation)