[Telepathy-commits] merge: telepathy-salut

[Merge Monkey]

Merge to:

  telepathy-salut

From:

  /home/smcv/public_html/darcs/salut-codegen

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Change TP_IFACE_OLPC_BUDDY_INFO back to SALUT_IFACE_OLPC_BUDDY_INFO now the constants generator is properly namespacing

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

  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.
Also use the generated SALUT_IFACE_OLPC_BUDDY_INFO in salut-connection.c.

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Resolve extensions/Makefile.am

  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>
    Resolve salut-connection.c