[Telepathy-commits] merge: telepathy-glib

[Merge Monkey]

Merge to:

  telepathy-glib

From:

  /home/sjoerd/telepathy-glib-sjoerd-simple-presence

Changes:

  Sjoerd Simons <sjoerd at luon.net>
    Reorder code so there is no need for a goto doing backflips

  Sjoerd Simons <sjoerd at luon.net>
    language cleanup

  Sjoerd Simons <sjoerd at luon.net>
    Fix construct_simple_presence_hash definition to comply with tp coding style

  Sjoerd Simons <sjoerd at luon.net>
    PresenceMixin: add type in GetPresences and PresencesChanged as per the merged version of SimplePresence

  Sjoerd Simons <sjoerd at luon.net>
    Add missing ; (woops)

  Sjoerd Simons <sjoerd at luon.net>
    PresenceMixin: Set uint values using g_value_set_uint instead of g_value_set_string

  Sjoerd Simons <sjoerd at luon.net>
    Use tp_svc_connection_interface_simple_presence_return_from_get_presence instead of tp_svc_connection_interface_presence_return_from_get_presence in the SimplePresence GetPresences implementation

  Sjoerd Simons <sjoerd at luon.net>
    Put SimplePresence in its own client side section

  Sjoerd Simons <sjoerd at luon.net>
    Remove trailing space

  Sjoerd Simons <sjoerd at luon.net>
    Small coding-style fix

  Sjoerd Simons <sjoerd at luon.net>
    Add SimplePresence to the documentation

  Sjoerd Simons <sjoerd at luon.net>
    Also rename the documentation comments

  Sjoerd Simons <sjoerd at luon.net>
    Generate code for the simple presence

  Sjoerd Simons <sjoerd at luon.net>
    PresenceMixin: Set the message boolean in the Status property as per the merged version of SimplePresence

  Sjoerd Simons <sjoerd at luon.net>
    s/Unreleased/UNRELEASED/

  Sjoerd Simons <sjoerd at luon.net>
    PresenceMixin: Fix some typos

  Sjoerd Simons <sjoerd at luon.net>
    Implement SimplePresence on top of the presence mixin

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

  Sjoerd Simons <sjoerd at luon.net>
    More explicit and clear naming for the functions referring to the SimplePresence interface