[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

  /home/cassidy/public_html/darcs/telepathy-salut-invites

Changes:

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    delay the creation of the tubes channel if we have to wait for the muc channel

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    for private olpc activities: use muc message to notify properties changes

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    start to announce an activity when its private property is switched to FALSE

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-self.c: factor out update_activity

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    bump telepathy-glib dependency to 0.5.14

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    set activity's properties in MUC invitations

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-connection: register the Self object as a read-only property

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    olpc_activity_properties_changed: if we use SalutSelf's properties, be sure something was actually updated before fire the signal

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-contact-manager: add salut_contact_manager_add_invited_activity to create activity due to incoming invitations

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-self.c: _set_olpc_activities_add: check if activity is private before announcing it / update its service

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-muc-manager.c: salut_muc_manager_get_text_channel ref the channel

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    Implement the ActivityPropertiesChanged signal with public activities

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    update salut-self's OLPC activities properties when they are changed from an external source

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-util: use tp_strdiff instead of strcmp

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut_contact_manager_add_invited_olpc_activity: insert the newly created activity to the hash table

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-contact.c: add a comment about olpc_announced_activities contents

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    fix --disable-olpc-build

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    make salut-contact-manager is_private aware

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    fix conflicts with the "register the IM, muc and XMPP connection managers as read only properties" patch

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    create_properties_table: recycle the GValue*

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-self: remove contact from the invited set when he joined activities

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-muc-channel: factor out salut_muc_channel_send_invitation and make it a public function

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    rename update_activity_privacy_policy to update_activity_privacy

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    fix conflict with HEAD

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    catch when a buddy change the activity privacy policy from private to public

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add comment about extract_properties_from_hash

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-connection.c: factor out create_properties_table

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    check-node-properties.c: test the boolean type

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-self: fix a regression. Activity properties are now announced when we announce the activity the first time

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    emit channel error if the connection to the muc failed

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-utilc: use strtol and strtoul instead of atoi

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-self: get properties from the contact-manager when we create an activity so we'll use its initial properties if any

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    resend pending invitations when changing activity properties to notify invited contact of the change

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-util.c: add support for boolean in gibber_xmpp_node_set_children_from_properties and salut_gibber_xmpp_node_extract_properties

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-contact: rename olpc_activities hash table to olpc_announced_activities and add salut_contact_join_private_olpc_activity public method to manage invitations

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-r-multicast-transport.c: assert priv->self != NULL when sending

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-self.h: trivial style fix

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    move augment_invitation from salut_connection to salut_self

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-self.c: factor out announcing activity code so we can create not public activities

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-self.c: update_activity_privacy: allow updated to be NULL

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-muc-channel.c: don't keep a ref on SalutSelf to avoid cyclic references

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    SalutSelf: add SalutConnection and SalutContactManager private variable

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    rename salut_contact_join_private_olpc_activity to salut_contact_takes_part_olpc_activity as we can be invited to join a public activity

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    fix some typos

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-contact-manager: factor out activity update code

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-self.c: if we create the activity in set_properties, we don't share it. Announce not previously shared activity in _set_olpc_activities_add

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-connection: factor out common code used in salut_connection_act_set_properties and check_properties

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-muc-channel.c: add a "ready" signal emitted when the muc connection is connected

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    use "bool" instead of "b" in salut_gibber_xmpp_node_extract_properties and gibber_xmpp_node_set_children_from_properties

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    rename salut_contact_takes_part_olpc_activity to salut_contact_takes_part_olpc_activity  and activity_have_id to activity_has_id

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    update_activity_privacy: move the activity privacy check from the caller into the function

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    rename salut_contact_manager_add_invited_activity to salut_contact_manager_add_invited_olpc_activity

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut_self_olpc_augment_invitation: add the activity ID in the invite

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-contact: avoid to have the same activity in the 2 hash tables at the same time

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-connection.c: register the IM, muc and XMPP connection managers as read only properties

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-self.c: when retrieving activity properties from the contact mgr, init their values to NULL to avoid to let them unset if contact manager doesn't know about these properties

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add "tags" olpc activity properties

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-self: when setting activities, ask to the contact-manager if he already know this activity and if it's a public one. If yes, we can announce the activity too

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    implement public -> private activity changes

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-contact: add a TODO item

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add salut_muc_manager_get_text_channel public function

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-connection: emit the ActivityPropertiesChanged signal even for activities we didn't join (fix regression)

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add "private" activity property

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    use tp_g_value_slice_new

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-self: remove deprecated FIXME as now private activities have to be announced using SetActivities

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-namespaces.h: add GIBBER_TELEPATHY_NS_OLPC_ACTIVITY_PROPS

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    remove FIXME about activity properties from invites. It's not a problem as SalutSelf's properties overwrite the one from the contact mgr

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-self.c: salut_self_set_olpc_activity_properties return an error if it don't know the activity as SetActivities is supposed to be called before

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-util.c: use "%u" for uint

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-muc-manager.c: wait the muc channel is ready before fire the new channel signal

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    observe incoming invitations to update buddy activities and activities properties

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    fix refcount problem when we are invited to a private activity and then this activity becomes public