[Telepathy-commits] merge: telepathy-sofiasip

[Merge Monkey]

Merge to:

  telepathy-sofiasip

From:

  /home/smcv/public_html/darcs/tpsip-smcv

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    TpsipMediaChannel: rearrange headers as per Telepathy coding style

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    TpsipTextChannel: implement the Channel properties from spec 0.17.7

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    sip-media-channel.h: re-order headers as per Telepathy coding style

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    TpsipTextChannel: re-indent g_param_spec_object call, and add G_PARAM_STATIC_NAME for less strdup()ing

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    TpsipTextChannel: update copyright year

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Require telepathy-glib 0.7.10 for spec 0.17.7

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    test-message.py: simplify by assigning Text channel type to a variable

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    TpsipTextChannel: re-order headers as per Telepathy coding style

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    TpsipTextChannel: add a GObject property 'interfaces'

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    TpsipMediaChannel: re-indent property definitions and give them all static name|nick|blurb

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    test-message.py: exercise the Channel D-Bus properties

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    TpsipMediaChannel: add an 'interfaces' GObject property

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    TpsipMediaChannel: add the Channel D-Bus properties (TargetHandleType etc.)

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    TpsipMediaChannel: additionally add the Group D-Bus properties (GroupFlags etc.)