[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/sjoerd/telepathy-gabble-sjoerd-simple-presence

Changes:

  Sjoerd Simons <sjoerd at luon.net>
    don't emit presences-updated when no presences are updated

  Sjoerd Simons <sjoerd at luon.net>
    Update to the new tp-glib simple presence function naming scheme

  Sjoerd Simons <sjoerd at luon.net>
    Set status to error on errors and to either unknown or offline depending if we have a roster subscription

  Sjoerd Simons <sjoerd at luon.net>
    More clear debug message

  Sjoerd Simons <sjoerd at luon.net>
    If handles are not in the presence cache set them as unknown or offline depending on whether we have a roster  subscription

  Sjoerd Simons <sjoerd at luon.net>
    Cope with the internal presence type enum being changed

  Sjoerd Simons <sjoerd at luon.net>
    Fix conflicts

  Sjoerd Simons <sjoerd at luon.net>
    Make it possible to update the presence cache of multiple handles at the same time

  Sjoerd Simons <sjoerd at luon.net>
    Use GABBLE_PRESENCE_LAST_UNAVAILABLE instead of checking for specific presences

  Sjoerd Simons <sjoerd at luon.net>
    Use DBUS_TYPE_G_UINT_ARRAY instead of G_POINTER in presences-updated

  Sjoerd Simons <sjoerd at luon.net>
    Add unknown and error status types

  Sjoerd Simons <sjoerd at luon.net>
    Fix coding style bug

  Sjoerd Simons <sjoerd at luon.net>
    Small code layout fix

  Sjoerd Simons <sjoerd at luon.net>
    Implement SimplePresence

  Sjoerd Simons <sjoerd at luon.net>
    Use GABBLE_PRESENCE_LAST_UNAVAILABLE to mark the last presence that's unavailable

  Sjoerd Simons <sjoerd at luon.net>
    Hook to the new presences-updated signal

  Sjoerd Simons <sjoerd at luon.net>
    Hook conn-olpc the new presences-updated signal

  Sjoerd Simons <sjoerd at luon.net>
    Remove resources and capabilities that gone into either unknown, offline or error

  Sjoerd Simons <sjoerd at luon.net>
    Don't use non-existing C operators

  Sjoerd Simons <sjoerd at luon.net>
    Change presence to unknown for all muc members when leaving the muc

  Sjoerd Simons <sjoerd at luon.net>
    Flush olpc info when a contact becomes unavailable