[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  telepathy-gabble-activities-try2

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    When resetting PEP on initial connection, use upload_activities_pep() and upload_activity_properties_pep()

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Pick up activity IDs from SetActivities() and the corresponding PEP node

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Recommend putting the .local hostname in the OOB negotiation for link-local MUC tubes

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    conn-olpc: fix activities array leak

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    conn-olpc: Start to implement activity uninvite (not working yet)

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    conn-olpc: add comments in remove_invite_foreach

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Fix initial PEP reset conflict with HEAD, but properly this time

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Merge -tubes and -invites versions of gabble_muc_factory_find_text_channel

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    gabble-muc-channel: Emit a signal just before sending invitations

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    stop sending invitations refresh after contact have joined the room

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add test-muc-invitation.py to tests/Makefile.am [re-recorded]

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    conn-olpc: when we join an activity, forget about all its invites

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Don't leak outgoing message when sending SetProperties() PEP

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Emit ActivitiesChanged when someone invites us. Alter our PEP activities list if someone else changes activity privacy

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GetCurrentActivity: remove code that made no sense and would never run

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Ignore echoed activity properties messages in MUCs

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    conn-olpc: add boolean check in check_prop_in_old_properties so we can know if the privacy status of the activity was changed

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Send re-invitations to people we already invited when we change activity properties

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Expose GabbleMucState enum in gabble-muc-channel.h so the state property can be interpreted correctly

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Resolve conflict between -tubes-muc and -trial3a

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    use gabble_muc_factory_find_text_channel instead of gabble_muc_factory_find_channel

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Refresh invitations when someone else changes activity properties too

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Resolve conflict: remove gabble_muc_factory_find_channel, again (thdarcs)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Allow activity property changes to be signalled via broadcasts in MUCs (same format as the pseudo-invitation, except @room is optional and ignored)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Refactor out activity_info_contribute_properties

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Merge -tubes fixes with -activities

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Get MUC channel self-handle correctly

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add tests/olpc-muc-prop-change [re-recorded]

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    In activity properties PEP uploads, only include things in our advertised activities list

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Emit ActivitiesChanged(handle, []) when someone goes offline

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    emit ActivityPropertiesChanged when user change activity properties [re-recorded]
Conflicts with -trial3a and -activities branches.
Original header:
Wed Aug 29 14:59:13 BST 2007  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    muc-channel: emit the "contact-join" when the local user has joined the channel too

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Document existing practice for Salut: re-inviting works by sending an updated invitation, rather than using a pseudo-invitation

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Hook up signals etc. needed for invitations. Send a pseudo-invitation with activity properties before sending each invitation

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Debug improvements in extract_activities()

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    When current activity changes to nothing, still emit the signal

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    conn-olpc: Use handle sets rather than linked lists of ActivityInfo

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    conn-olpc: replace 3 lm_message_node_set_attribute calls by lm_message_node_set_attributes

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Fix conflict with HEAD - ignoring replies we don't care about, vs. we now check all PEP replies

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Drop now-unused set_activity_properties helper function

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add olpc-muc-{invitation,prop-change}.py to tests/Makefile.am [re-recorded]

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    conn-olpc: emit BuddyInfo::ActivitiesChanged in remove_invite_foreach

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    s/activities_list/activities_set

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Split olpc_contacts_activities into olpc_pep_activities and olpc_invited_activities

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Avoid advertising private activities in PEP

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Simplify removal of closed channels from activity property records

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Don't crash when a contact with no advertised activities goes offline

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gabble-muc-channel: use global self handle instead of muc specific self handle when emitting the contact-join signal

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Remove obsolete comment [re-recorded, conflicts with trial3a and -activities branches]

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    In activity SetProperties implementation, add missing return in error path

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Harvest activity info from pseudo-invitation messages

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add gabble_muc_factory_find_text_channel (for use by conn-olpc, mostly)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Document link-local MUC usage too

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    always add the invitee handle in the set when catching the pre-invite signal

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    extract_current_activity: return FALSE if room name is ""

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Only re-send pseudo-invitations if activity properties actually changed

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add OLPC activities protocol to docs/

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    conn-olpc: muc contact-join signal now use global self handle

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    s/conctact/contact

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    conn-olpc: remove ActivityInfoChangeCallback as it's not used

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    emit BuddyInfo::ActivitiesChanged when we receive an uninvite message

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    conn-olpc: add debug output when revoking invitations

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    When we leave a public activity, delete it from our PEP

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Include the activity ID in activity properties.
This may mean we can get rid of the split between activities and activity
properties in PEP eventually.

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add tests/test-muc-invitation.py [re-recorded]

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    OLPC activities are private by default

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    conn-olpc: wait we have really joined the muc before forget about the invites

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    set properties changes muc message type="groupchat" to make server happy

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    conn_olpc_process_activity_properties_message: return when ignoring echoed activity properties message

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Don't return early if pubsub reply has no <activities> - we still want to put any invited activities in the GetActivities() reply

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    improve debug output for current activity changes

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    get_activities_reply_cb: raise a D-Bus error if pubsub reply is bugged

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add a hint regarding how to get xep.xsl

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Only put public activities in PEP activity-properties node

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Explicitly indicate the protocol for each tube

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Notify MUCs when we change the activity properties

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add tests/olpc-muc-invitation.py [re-recorded]

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Put private (invited) activities in the return from GetActivities()

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    use upload_activities_pep in olpc_buddy_info_set_activities so only public activities are send