[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

  telepathy-salut-olpc-rollup

Changes:

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    build tube support

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tube-dbus: ref the muc-connection

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tubes-channel: Unknow -> Unknown

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tube-dbus: we really have to check if destination != NULL to manage broadcasted messages

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    don't generate and build tube-dbus-signals-marshal.[ch]

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    muc-manager: no need to remove twice the same channel when closing it

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-connection: don't use // comments

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Fix name of dbus_g_method_return_error (not dbus_g_return_error)

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add tube-iface.[ch]

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tubes-channel: remove not ready private tubes code

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Don't build activity_new and activity_unref unless ENABLE_OLPC

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add a tube debug flag

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    muc-channel: unref the entry group when destroying the channel

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    rename SalutMucChannel property from "muc connection" to "muc-connection"

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Merge -tubes and -publish branches

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Don't build SalutContactActivity code unless ENABLE_OLPC

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    remove unwanted double space

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tubes-channel: changes to fit "old" tube API

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add telepathy-glib-unstable C and LIBS flags when building

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-tubes-channel.c: disconnect signals and unref the muc connection when disposing

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    intented > intended

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    disable the tubes manager as private tubes aren't working anyway

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tube-dbus.c: set priv->muc_connection to NULL after we unrefed it

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Recognise NULL activity/room (i.e. no =) as being the same as ""

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gibber-bystream-ibb: rephrase PROP_XMPP_CONNECTION and PROP_MUC_CONNECTION description

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    muc_channel_publish_service: properly destroy the muc_group if error

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Don't try to hook activity resolved callback unless ENABLE_OLPC

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-muc-manager.c: add muc tubes support

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tubes-channel: set the initiator in publish_tube_in_node and not in publish_tubes_in_node

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-muc-manager.c: fix typo in comment in salut_muc_manager_factory_iface_request

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-connection: call salut_muc_manager_start

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    publish_tube_in_node: set stream-id instead of stream_id as attribute to be more consistent

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tube-dbus.c: set bytestream state in a variable to avoid double g_object_new

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Remove comment which is no longer true

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    instantiate the tubes manager

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tube-dbus.c: properly initiate the bytestream when we create it the local pending state

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-tubes-channel.c: when a contact left the muc, remove him from all tubes

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut_muc_manager_factory_iface_foreach iterates on tubes hash table too

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Resolve conflict in src/Makefile.am: we've removed both tube-dbus-signals-marshal.list and salut-muc-connection-signals-marshal.list

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tubes-channel: extract_tube_information have to check the value of this initiator_handle and not the pointer

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-muc-manager.c: try to use announced address/port when we request a muc channel

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Correctly return handle type ROOM from GetHandle() on MUC channels

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    resolve conflicts in salut-muc-manager.c

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add comments about DNS record

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add bytestream debug flag in salut debug

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Pass NULL for key to avahi_string_list_get_pair when we don't want it anyway.
Also use char * rather than gchar * for strings that should be freed with
avahi_free(), and narrow the scope of some variables.

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    update_tubes_info returns a boolean so caller can know if it worked fine

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tubes-channel.c: don't use // comments

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Implement activity properties and activity advertisement

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add gibber-bytestream-ibb.[ch]

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-muc-manager: rename priv->channels to priv->text_channels

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tube-dbus.c: pass the contact_repo to unref_handle_foreach instead of the tube object

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Correct sense of return from salut_self_set_olpc_activities

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tube-dbus.c: directly use g_cclosure_marshal_VOID__VOID instead of our own marshaller

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut_tubes_channel_get_handle: set the right handle type

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tube-dbus: remove useless dbus_message_get_destination extra calls

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    simplify generate_stream_id

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add support for OLPC SetActivities, SetCurrentActivity and GetCurrentActivity, along with stub for GetActivities

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    resolve conflicts

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add IBB and AMP NS

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add gibber-bytestream-ibb-signals-marshal.list

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tubes-channel: remove start_initiation as we don't use it now

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    remove tube-dbus-signals-marshal.list

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-connection: don't include salut-tubes-manager.h

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    muc-channel: publish the muc service when we join it

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Correct sense of assertions in salut_self_add_olpc_activity

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add bytestream flag in gibber-debug

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tubes-channel: extract_tube_information: check if tube id is numeric

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add tube-dbus.[ch] and tube-dbus-signals-marshal.list

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

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Fix some contact ref leaks

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    don't build salut-tubes-manager.c as we don't use it

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    tube-dbus: rewrite PROP_MUC_CONNECTION description

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Fix debug message

  Sjoerd Simons <sjoerd at luon.net>
    Remove salut-muc-connection-signals-marshal.list from makefile.am which accidentally disappeared

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

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

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    GetBuddyProperties: use stack-allocated GError

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    configure.ac: check fo telepathy-glib-unstable

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    make Salut link on telepathy-glib-unstable

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-muc-manager: add priv->client to store the AvahiClient and the method salut_muc_manager_start (re-recorded)

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    salut-muc-channel: add a "client" property containing the SalutAvahiClient