[Telepathy-commits] merge: telepathy-gabble

[Merge Monkey]

Merge to:

  telepathy-gabble

From:

  /home/smcv/public_html/darcs/gabble-smcv

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Update c-interfaces-generator.xsl from telepathy-glib - it now takes a --stringparam to set the prefix for interface constants

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Textual tweaks to the BuddyInfo specification

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    OLPC_Buddy_Info.xml: explicitly specify that unchanged properties are included in PropertiesChanged

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Update genginterface.py from telepathy-glib

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Explicitly specify that SetProperties is a "replace", not "update" operation

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Require that SetProperties() in the BuddyInfo interface can be called before Connect()

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Update c-constants-generator from telepathy-glib (requires --stringparam mixed-case-prefix)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add paragraphing to SetProperties() docstring

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    extensions/Makefile.am: get all.xml from $(srcdir)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Correct BuddyInfo spec: the subscribe list is called subscribe, not subscribed

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add JID to OLPC buddy info extension