[Telepathy-commits] merge: telepathy-gabble

Merge Monkey monkey at collabora.co.uk
Thu Dec 13 02:43:59 PST 2007


Merge to:

  telepathy-gabble

From:

  /home/cassidy/public_html/darcs/telepathy-gabble-olpc-bundle

Changes:

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

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gabble-connection: use a hash table instead of a IntSet to store bundles

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    _gabble_connection_signal_own_presence: use a GString instead of multi string allocation

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add test-olpc-bundle.py to tests set

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    ensure we have set the PRESENCE_CAP_OLPC when we use the OLPC interface

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    add test-olpc-bundle.py

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    test-olpc-bundle.py: remove unused import

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    presence-cache: set the PRESENCE_CAP_OLPC when seeing OLPC PEP notify NS

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    _gabble_connection_signal_own_presence: add a comment about the hash table used as a set

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    test-olpc-bundle.py: updated to use new test API

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    rename OLPC bundle to "olpc1"

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    gabble-connection: ensure we don't set more than one time each bundle in our presence

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    move GabblePresenceCapabilities from presence.h to gabble-types.h as we'll need it in gabble-connection.h

  Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
    move OLPC notify ns to the "olpc" bundle


More information about the Telepathy-commits mailing list