[Telepathy-commits] merge: telepathy-spec

[Merge Monkey]

Merge to:

  telepathy-spec

From:

  /home/smcv/public_html/darcs/telepathy-spec-smcv

Changes:

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Connection: rename Channel_List_Entry to Channel_Info and Channel_List to Channel_Info_List

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Rename Stream_List_Entry and Stream_List to Media_Stream_Info and Media_Stream_List

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Rename Tube_List_Entry to Tube_Info and Tube_List to Tube_Info_List

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Rename Room_List_Entry and Room_List to Room_Info and Room_Info_List

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Channel_Type_Tubes: add Socket_Netmask_IPv4, Socket_Address_IPv4 and corresponding IPv6 structures

  Simon McVittie <simon.mcvittie at collabora.co.uk>
    Oops, remember to give netmask struct types their own name