[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

  /home/sjoerd/telepathy-salut-sjoerd-cerebro

Changes:

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    connection: use the OLPC activity manager

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-muc-manager: abstract muc channel creation in the muc manager

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add salut-avahi-discovery-client.[ch]

  Sjoerd Simons <sjoerd at luon.net>
    SalutContact: Whitespace fixes

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add salut-olpc-activity.[ch]

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add salut-discovery-client.[ch]

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    olpc-activity: unref the muc when it's closed

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add salut-avahi-olpc-activity-manager.[ch]

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    build new files

  Sjoerd Simons <sjoerd at luon.net>
    SalutContact: Restart retrieving the avatar if the token was changed while retrieving it and only start retrieving an avatar when a new request came in while there were no outstanding requests

  Sjoerd Simons <sjoerd at luon.net>
    Split up contact changes in multiple functions

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-connection: disconnect signals when disposing the discovery client

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    remove salut_contact_manager_new

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add salut-avahi-olpc-activity.[ch]

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    muc-mgr: emit the closed signal when closing all channels

  Sjoerd Simons <sjoerd at luon.net>
    SalutAvahiSelf: Fix setting of the nickname parameter on the self object

  Sjoerd Simons <sjoerd at luon.net>
    Fix the casting in the various _GET_PRIV macros

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add salut-olpc-activity-manager.[ch]

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-avahi-olpc-activity-manager: fix a free and an unref issue

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    discovery-client: fix build when OLPC support is disabled

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    avahi-discovery-client: implement _create_contact_manager

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add salut-avahi-contact-manager.[ch]

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    avahi-olpc-activity: fix handle leaks

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add /salut-avahi-contact.[ch]

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    contact: remove OLPC activity tracking. That's the olpc-activity-mgr's job now

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-contact-manager: start to abstract avahi bits

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    unref the muc channel when we left an activity

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    muc-channel: don't keep a ref on the muc mgr

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-contact: abstract avahi bits for presence and avatar

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    muc-channel: rely on abstract methods to announce muc service

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-avahi-discovery-client.c: change state when disposing the client

  Sjoerd Simons <sjoerd at luon.net>
    Coding style fixes

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    contact-manager: move disposing code to close_all method

  Sjoerd Simons <sjoerd at luon.net>
    Only send message types salut knows about

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-muc-manager: remove all Avahi code and rely on abstract methods for discovery

  Sjoerd Simons <sjoerd at luon.net>
    Remove useless constructor functions from various classes

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    avahi-muc-manager: add missing include

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-avahi-muc-channel.c: dispose function have to be static

  Sjoerd Simons <sjoerd at luon.net>
    Do proper error handling if adding a resolver for a contact fails

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-discovery-client: add disconnecting state

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-contact-manager: create a constructor to properly create the object

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    self: fix build when OLPC support is disabled

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add salut-avahi-self.[ch]

  Sjoerd Simons <sjoerd at luon.net>
    SalutAvahiContact: don't call _avatar_request_flush twice if getting the avatar failed

  Sjoerd Simons <sjoerd at luon.net>
    SalutAvahiOlpcActivityManager: fix typo so it compiles again

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-olpc-activity-manager: always unref the activity when we call salut_contact_joined_activity

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add salut_muc_channel_new

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    discovery-client: add salut_discovery_client_create_self method

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    discovery-client: add salut_discovery_client_create_olpc_activity_manager

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    olpc-activity: contact have to be unrefed after salut_contact_manager_get_contact call

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    avahi-contact-manager: destroy the client after the resolver

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-connection: use new contact mgr API

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-contact-manager: abstract avahi bits

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    debug: add olpc-activity flag

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    remove some old comments

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    muc-manager: remove useless old code

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    avahi-contact: pass NULL to salut_contact_change if OLPC support is disabled

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    build new files

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-connection: use the discovery client to instantiate the self object

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-self: abstract presence and avatar announcement

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-avahi-muc-manager: destroy the discovery client after the browser

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    olpc-activity-manager: move the activities_by_room hash table to private

  Sjoerd Simons <sjoerd at luon.net>
    Drop the ref to a AvahiContact when it has no more services

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-muc-manager: move code from _new function to properties and constructor

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add salut-avahi-muc-channel.[ch]

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    build salut-avahi-muc-channel

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    avahi-discovery-client: implement salut_discovery_client_create_olpc_activity_manager

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-debug: add discovery flag

  Sjoerd Simons <sjoerd at luon.net>
    Salut doesn't support messages of type autoreply, but does support type notice

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add salut-avahi-muc-manager.[ch]

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    discovery-client: add salut_discovery_client_create_contact_manager

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    avahi-muc-manager.c: coding style tweaks

  Sjoerd Simons <sjoerd at luon.net>
    SalutAvahiContact: If _retrieve_avatar is called again, restart retrieving the avatar

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-connection: start to abstract Avahi

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    build salut-avahi-contact-manager

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-avahi-contact-manager: remove OLPC activity code. Create salut-avahi-contact objects

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    muc-channel: don't keep a ref on the XCM, the muc mgr keep one for us