[Telepathy-commits] merge: telepathy-glib

[Merge Monkey]

Merge to:

  telepathy-glib

From:

  /home/smcv/public_html/darcs/tp-glib-smcv

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Include TpCMParamSetter, tp_cm_param_setter_offset in gtkdoc

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Rename types in gtypes-input.xml to match what I want to land in the spec

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add tp_debug_set_persistent to gtkdoc

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Fix tools/Makefile.am: glib-client-marshaller-gen.py, not .xsl

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Update MEDIA_STREAM_HANDLER gtypes

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add missing internal-dbus-glib.h

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add proper G_BEGIN_DECLS/G_END_DECLS to headers that were missing them

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    telepathy-glib/dbus.c: use proper prototypes for void functions

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Align gtypes-input.xml with proposed spec updates

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Generate a function _tp_register_dbus_glib_marshallers which registers dbus-glib marshallers for all stable interfaces' signals

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Add TP_HASH_TYPE_ALIAS_MAP to gtkdoc